File unbundle_glm.patch of Package organicmaps

Overview Repositories Revisions Requests Users Attributes Meta

File unbundle_glm.patch of Package organicmaps

Index: organicmaps-2024.11.12/drape/CMakeLists.txt
===================================================================
--- organicmaps-2024.11.12.orig/drape/CMakeLists.txt
+++ organicmaps-2024.11.12/drape/CMakeLists.txt
@@ -157,8 +157,12 @@ endif()
 
 omim_add_library(${PROJECT_NAME} ${SRC})
 
-# Do not include glm's CMakeLists.txt, because it's outdated and not necessary.
-target_include_directories(${PROJECT_NAME} PUBLIC ${OMIM_ROOT}/3party/glm)
+IF(LINUX_DETECTED)
+    find_package(glm REQUIRED)
+ELSE()
+    # Do not include glm's CMakeLists.txt, because it's outdated and not necessary.
+    target_include_directories(${PROJECT_NAME} PUBLIC ${OMIM_ROOT}/3party/glm)
+ENDIF(LINUX_DETECTED)
 
 if (PLATFORM_LINUX)
   find_package(OpenGL)
Index: organicmaps-2024.11.12/shaders/CMakeLists.txt
===================================================================
--- organicmaps-2024.11.12.orig/shaders/CMakeLists.txt
+++ organicmaps-2024.11.12/shaders/CMakeLists.txt
@@ -141,8 +141,12 @@ if (PLATFORM_IPHONE)
   )
 endif()
 
-# Do not include glm's CMakeLists.txt, because it's outdated and not necessary.
-target_include_directories(${PROJECT_NAME} PUBLIC "${OMIM_ROOT}/3party/glm")
+IF(LINUX_DETECTED)
+    find_package(glm REQUIRED)
+ELSE()
+    # Do not include glm's CMakeLists.txt, because it's outdated and not necessary.
+    target_include_directories(${PROJECT_NAME} PUBLIC "${OMIM_ROOT}/3party/glm")
+ENDIF(LINUX_DETECTED)
 
 target_link_libraries(${PROJECT_NAME} drape)

Places

File unbundle_glm.patch of Package organicmaps

Places