CMake: Shrot term fix for CMakeFetchContent setting CMP0135 to OLD

FLAMEGPU · Aug 29, 2024 · 3befb59 · 3befb59
1 parent 8afc40e
commit 3befb59
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 5 deletions.
diff --git a/cmake/dependencies/devil.cmake b/cmake/dependencies/devil.cmake
@@ -8,10 +8,14 @@ if(UNIX)
                         "e.g. sudo apt install libdevil-dev")
     endif()
 elseif(WIN32)
-
+    include(FetchContent)
     # As the URL method is used for download, set the policy if available
     if(POLICY CMP0135)
-    cmake_policy(SET CMP0135 NEW)
+        cmake_policy(SET CMP0135 NEW)
+    endif()
+    # Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223
+    if(POLICY CMP0169)
+        cmake_policy(SET CMP0169 OLD)
     endif()
 
     # On windows, always download manually. There are issues with find_package and multi-config generators where a release library will be found, but no debug library, which can break things.

diff --git a/cmake/dependencies/glew.cmake b/cmake/dependencies/glew.cmake
@@ -10,10 +10,15 @@ if(UNIX)
                             "e.g. sudo apt install libglew-dev")
     endif ()
 elseif(WIN32)
+    include(FetchContent)
     # As the URL method is used for download, set the policy if available
     if(POLICY CMP0135)
         cmake_policy(SET CMP0135 NEW)
     endif()
+    # Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223
+    if(POLICY CMP0169)
+        cmake_policy(SET CMP0169 OLD)
+    endif()
     # On windows, always download manually. There are issues with find_package and multi-config generators where a release library will be found, but no debug library, which can break things.
     # Declare source properties
     # This mirror is linked from the official Glew website, and more stable than SourceForge

diff --git a/cmake/dependencies/glm.cmake b/cmake/dependencies/glm.cmake
@@ -2,9 +2,14 @@
 # glm #
 #######
 
+include(FetchContent)
 # As the URL method is used for download, set the policy if available
 if(POLICY CMP0135)
-  cmake_policy(SET CMP0135 NEW)
+    cmake_policy(SET CMP0135 NEW)
+endif()
+# Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223
+if(POLICY CMP0169)
+    cmake_policy(SET CMP0169 OLD)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules/ ${CMAKE_MODULE_PATH})

diff --git a/cmake/dependencies/imgui.cmake b/cmake/dependencies/imgui.cmake
@@ -4,9 +4,15 @@
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules/ ${CMAKE_MODULE_PATH})
 include(FetchContent)
-
 cmake_policy(SET CMP0079 NEW)
-
+# As the URL method is used for download, set the policy if available
+if(POLICY CMP0135)
+    cmake_policy(SET CMP0135 NEW)
+endif()
+# Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223
+if(POLICY CMP0169)
+    cmake_policy(SET CMP0169 OLD)
+endif()
 # Change the source_dir to allow inclusion via imgui/imgui.h rather than imgui.h
 FetchContent_Declare(
     imgui

diff --git a/cmake/dependencies/sdl2.cmake b/cmake/dependencies/sdl2.cmake
@@ -25,9 +25,15 @@ elseif(WIN32)
     # On windows, always download manually. There are issues with find_package and multi-config generators where a release library will be found, but no debug library, which can break things.
     # Declare source properties
     # As the URL method is used for download, set the policy if available
+    include(FetchContent)
+    # As the URL method is used for download, set the policy if available
     if(POLICY CMP0135)
         cmake_policy(SET CMP0135 NEW)
     endif()
+    # Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223
+    if(POLICY CMP0169)
+        cmake_policy(SET CMP0169 OLD)
+    endif()
     FetchContent_Declare(
         SDL2
         URL "https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip"