From 9e528a486200834f890057ce92044868304a01e2 Mon Sep 17 00:00:00 2001 From: Peter Heywood Date: Thu, 22 Aug 2024 14:06:50 +0100 Subject: [PATCH] CMake: Short term fix for policy CMP0169 Sets policy CMP0169 to OLD to prevent dev warnings related to FetchContent_Populate(). This needs fixing propperly for longer term support, see #1223 --- cmake/dependencies/Jitify.cmake | 4 ++++ cmake/dependencies/Thrust.cmake | 4 ++++ cmake/dependencies/Tinyxml2.cmake | 4 ++++ cmake/dependencies/flamegpu2-visualiser.cmake | 4 ++++ cmake/dependencies/glm.cmake | 4 ++++ cmake/dependencies/googletest.cmake | 4 ++++ cmake/dependencies/rapidjson.cmake | 4 ++++ swig/CMakeLists.txt | 5 ++++- 8 files changed, 32 insertions(+), 1 deletion(-) diff --git a/cmake/dependencies/Jitify.cmake b/cmake/dependencies/Jitify.cmake index d5aa509c2..da737d457 100644 --- a/cmake/dependencies/Jitify.cmake +++ b/cmake/dependencies/Jitify.cmake @@ -5,6 +5,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules/ ${CMAKE_MODULE_PATH}) include(FetchContent) cmake_policy(SET CMP0079 NEW) +# 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 jitify/jitify.hpp rather than jitify.hpp FetchContent_Declare( diff --git a/cmake/dependencies/Thrust.cmake b/cmake/dependencies/Thrust.cmake index 3f8bc8690..3f1088c7c 100644 --- a/cmake/dependencies/Thrust.cmake +++ b/cmake/dependencies/Thrust.cmake @@ -6,6 +6,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules/ ${CMAKE_MODULE_PATH}) include(FetchContent) cmake_policy(SET CMP0079 NEW) +# Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223 +if(POLICY CMP0169) + cmake_policy(SET CMP0169 OLD) +endif() # Set the minimum supported cub/thrust version, and the version to fetch # Thrust minimum version to 1.16 to avoid windows.h related issues and pull in bug fixes, but fetch the most recent 1.x release otherwise (at the time of writing). diff --git a/cmake/dependencies/Tinyxml2.cmake b/cmake/dependencies/Tinyxml2.cmake index ad8cad118..2524078a1 100644 --- a/cmake/dependencies/Tinyxml2.cmake +++ b/cmake/dependencies/Tinyxml2.cmake @@ -6,6 +6,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules/ ${CMAKE_MODULE_PATH}) include(FetchContent) cmake_policy(SET CMP0079 NEW) +# 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 tinyxml2/tinyxml2.h rather than tinyxml2.h FetchContent_Declare( diff --git a/cmake/dependencies/flamegpu2-visualiser.cmake b/cmake/dependencies/flamegpu2-visualiser.cmake index 88f5a02c6..cb0357a57 100644 --- a/cmake/dependencies/flamegpu2-visualiser.cmake +++ b/cmake/dependencies/flamegpu2-visualiser.cmake @@ -5,6 +5,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules/ ${CMAKE_MODULE_PATH}) include(FetchContent) cmake_policy(SET CMP0079 NEW) +# Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223 +if(POLICY CMP0169) + cmake_policy(SET CMP0169 OLD) +endif() # Set the visualiser repo and tag to use unless overridden by the user. set(DEFAULT_FLAMEGPU_VISUALISATION_GIT_VERSION "flamegpu-2.0.0-rc.1") diff --git a/cmake/dependencies/glm.cmake b/cmake/dependencies/glm.cmake index d328c9545..9e9b45ef1 100644 --- a/cmake/dependencies/glm.cmake +++ b/cmake/dependencies/glm.cmake @@ -6,6 +6,10 @@ 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() set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules/ ${CMAKE_MODULE_PATH}) include(FetchContent) diff --git a/cmake/dependencies/googletest.cmake b/cmake/dependencies/googletest.cmake index 824337a87..d30fa8327 100644 --- a/cmake/dependencies/googletest.cmake +++ b/cmake/dependencies/googletest.cmake @@ -5,6 +5,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules/ ${CMAKE_MODULE_PATH}) include(FetchContent) cmake_policy(SET CMP0079 NEW) +# Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223 +if(POLICY CMP0169) + cmake_policy(SET CMP0169 OLD) +endif() FetchContent_Declare( googletest diff --git a/cmake/dependencies/rapidjson.cmake b/cmake/dependencies/rapidjson.cmake index a83127541..3a3819606 100644 --- a/cmake/dependencies/rapidjson.cmake +++ b/cmake/dependencies/rapidjson.cmake @@ -6,6 +6,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules/ ${CMAKE_MODULE_PATH}) include(FetchContent) include(ExternalProject) cmake_policy(SET CMP0079 NEW) +# Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223 +if(POLICY CMP0169) + cmake_policy(SET CMP0169 OLD) +endif() # a95e013b97ca6523f32da23f5095fcc9dd6067e5 is the last commit before a change which breaks our method of finding rapid json without running a cmake install first. # but we also need to patch this to avoid a cmake >= 3.26.4 deprecation, but this is handled manually post-population diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index 902071824..848f7aeaf 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -1,7 +1,10 @@ # Minimum CMake version 3.18 for CUDA --std=c++17 cmake_minimum_required(VERSION 3.18...3.25 FATAL_ERROR) include(FetchContent) - +# Temporary CMake >= 3.30 fix https://github.com/FLAMEGPU/FLAMEGPU2/issues/1223 +if(POLICY CMP0169) + cmake_policy(SET CMP0169 OLD) +endif() # Set some policy behaviours for SWIG