4617dfb92e
The GLM derivation was updated from 0.9.8.5 to 0.9.9.8, and the CMake target name changed from glm to the namespaced glm::glm.
35 lines
1,000 B
Diff
35 lines
1,000 B
Diff
From 9718cdb4bdaf7203d07789b2dc5eec4060538889 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Bosch <maximilian@mbosch.me>
|
|
Date: Fri, 9 Jul 2021 11:37:22 +0200
|
|
Subject: [PATCH] bundle system-glm in seriousproton
|
|
|
|
---
|
|
CMakeLists.txt | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index cbd68ca..730df82 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -81,6 +81,9 @@ if(NOT ${SFML_FOUND})
|
|
)
|
|
endif()
|
|
|
|
+
|
|
+find_package(glm)
|
|
+
|
|
add_subdirectory(src/Box2D)
|
|
add_subdirectory(src/lua)
|
|
add_subdirectory(src/GL)
|
|
@@ -205,7 +208,7 @@ target_compile_options(seriousproton_deps
|
|
|
|
target_link_libraries(seriousproton_deps
|
|
INTERFACE
|
|
- box2d lua glew ${SFML_LIBRARIES}
|
|
+ box2d lua glew ${SFML_LIBRARIES} glm::glm
|
|
"$<$<BOOL:${WIN32}>:wsock32>"
|
|
# LTO flag must be on the linker's list as well.
|
|
"$<$<AND:$<BOOL:${CMAKE_COMPILER_IS_GNUCC}>,$<OR:$<CONFIG:RelWithDebInfo>,$<CONFIG:Release>>>:-flto>"
|
|
--
|
|
2.31.1
|