Replace glm::glm target with LibGlm, add -DGLM_ENABLE_EXPERIMENTAL

Author: Grumbel

CMakeLists.txt

@@ -200,9 +200,6 @@ add_library(supertux2_c OBJECT ${SUPERTUX_SOURCES_C})
 add_library(supertux2_lib STATIC ${CMAKE_BINARY_DIR}/version.h ${SUPERTUX_SOURCES_CXX} ${SUPERTUX_RESOURCES} $<TARGET_OBJECTS:supertux2_c>)
 target_include_directories(supertux2_lib PUBLIC ${CMAKE_BINARY_DIR} src/)
 
-target_link_libraries(supertux2_lib PUBLIC glm::glm)
-target_compile_definitions(supertux2_lib PUBLIC -DGLM_ENABLE_EXPERIMENTAL)
-
 if(WIN32)
   add_executable(supertux2 WIN32 src/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.rc)
   target_link_libraries(supertux2 LibSDL2main)
@@ -251,6 +248,7 @@ target_link_libraries(supertux2_lib PUBLIC LibPartioZip)
 target_link_libraries(supertux2_lib PUBLIC LibOpenAL)
 target_link_libraries(supertux2_lib PUBLIC LibOggVorbis)
 target_link_libraries(supertux2_lib PUBLIC LibBoost)
+target_link_libraries(supertux2_lib PUBLIC LibGlm)
 target_link_libraries(supertux2_lib PUBLIC LibFmt)
 target_link_libraries(supertux2_lib PUBLIC LibPhysfs)
 

mk/cmake/SuperTux/ProvideGlm.cmake

@@ -3,13 +3,21 @@ find_package(glm QUIET)
 if(glm_FOUND)
   if(TARGET glm::glm)
     message(STATUS "Found glm")
-    add_library(LibGlm ALIAS glm::glm)
+
+    add_library(LibGlm INTERFACE IMPORTED)
+    set_target_properties(LibGlm PROPERTIES
+      INTERFACE_LINK_LIBRARIES "glm::glm"
+      INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:glm::glm,INTERFACE_INCLUDE_DIRECTORIES>"
+      INTERFACE_COMPILE_DEFINITIONS "GLM_ENABLE_EXPERIMENTAL")
   else()
     # fallback for old glm version in EmuELEC and Nix
     message(STATUS "Found glm: ${GLM_INCLUDE_DIR}")
+
     add_library(LibGlm INTERFACE IMPORTED)
     set_target_properties(LibGlm PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:glm,INTERFACE_INCLUDE_DIRECTORIES>")
+      INTERFACE_LINK_LIBRARIES "glm"
+      INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:glm,INTERFACE_INCLUDE_DIRECTORIES>"
+      INTERFACE_COMPILE_DEFINITIONS "GLM_ENABLE_EXPERIMENTAL")
   endif()
 else()
   # fallback for old glm version in UBPorts
@@ -23,7 +31,8 @@ else()
   message(STATUS "Found glm: ${GLM_INCLUDE_DIR}")
   add_library(LibGlm INTERFACE IMPORTED)
   set_target_properties(LibGlm PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES ${GLM_INCLUDE_DIR})
+    INTERFACE_INCLUDE_DIRECTORIES "${GLM_INCLUDE_DIR}"
+    INTERFACE_COMPILE_DEFINITIONS "GLM_ENABLE_EXPERIMENTAL")
 endif()
 
 # EOF #