Update CMake policy handling

computationalgeography · Aug 29, 2024 · 6554cd4 · 6554cd4
1 parent 5b509a9
commit 6554cd4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -134,7 +134,7 @@ jobs:
                       -S ${{ env.lue_source_directory }} \
                       -B ${{ env.lue_build_directory }} \
                       --preset conan-release \
-                      -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
+                      -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                       -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
                       -D LUE_BUILD_DOCUMENTATION=TRUE \
                       -D LUE_BUILD_QA=TRUE \
@@ -197,7 +197,7 @@ jobs:
                   -S ${{ env.lue_consume_source_directory }} \
                   -B ${{ env.lue_consume_build_directory }} \
                   -G "Ninja" \
-                  -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
+                  -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                   -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
                   -D CMAKE_BUILD_TYPE=Release \
                   -D lue_ROOT=${{ env.lue_development_install_directory }} \

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -133,7 +133,7 @@ jobs:
                       -B ${{ env.lue_build_directory }} \
                       --preset conan-release \
                       -D CMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.macos_version }}.0 \
-                      -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
+                      -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                       -D LUE_BUILD_QA=TRUE \
                       -D LUE_QA_WITH_PYTHON_API=TRUE \
                       -D LUE_QA_WITH_TESTS=TRUE \
@@ -202,7 +202,7 @@ jobs:
                   -S ${{ env.lue_consume_source_directory }} \
                   -B ${{ env.lue_consume_build_directory }} \
                   -G "Ninja" \
-                  -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
+                  -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                   -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
                   -D CMAKE_BUILD_TYPE=Release \
                   -D lue_ROOT=${{ env.lue_development_install_directory }} \

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -108,7 +108,7 @@ jobs:
             #       C:\Users\runneradmin\miniconda3\envs\test/Library
             #     Invalid character escape '\U'.
             # HPX install logic needs to be updated, similar to how Boost_ROOT is handled
-            cmake_flags: "-D CMAKE_POLICY_DEFAULT_CMP0167=OLD -D CMAKE_POLICY_DEFAULT_CMP0169=OLD -D Boost_ROOT=$CONDA_PREFIX/Library -D Hwloc_ROOT=C:/Users/runneradmin/miniconda3/envs/test/Library -D Hwloc_LIBRARY=$CONDA_PREFIX/Library/lib/hwloc.lib"
+            cmake_flags: "-D Boost_ROOT=$CONDA_PREFIX/Library -D Hwloc_ROOT=C:/Users/runneradmin/miniconda3/envs/test/Library -D Hwloc_LIBRARY=$CONDA_PREFIX/Library/lib/hwloc.lib"
             hpx_branch: ${{ env.hpx_branch }}
             source_directory: ${{ env.hpx_source_directory }}
             build_directory: ${{ env.hpx_build_directory }}
@@ -150,8 +150,7 @@ jobs:
                       -S ${{ env.lue_source_directory }} \
                       -B ${{ env.lue_build_directory }} \
                       --preset conan-release \
-                      -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
-                      -D CMAKE_POLICY_DEFAULT_CMP0169=OLD \
+                      -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                       -D LUE_BUILD_QA=TRUE \
                       -D LUE_QA_WITH_PYTHON_API=TRUE \
                       -D LUE_QA_WITH_TESTS=TRUE \
@@ -226,7 +225,7 @@ jobs:
                   -S ${{ env.lue_consume_source_directory }} \
                   -B ${{ env.lue_consume_build_directory }} \
                   -G "Ninja" \
-                  -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
+                  -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                   -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
                   -D CMAKE_BUILD_TYPE=Release \
                   -D lue_ROOT=${{ env.lue_development_install_directory }} \

diff --git a/CMakeHPXPresets.json b/CMakeHPXPresets.json
@@ -5,6 +5,8 @@
             "name": "hpx_shared_configuration",
             "hidden": true,
             "cacheVariables": {
+                "CMAKE_POLICY_DEFAULT_CMP0167": "NEW",
+                "CMAKE_POLICY_DEFAULT_CMP0169": "OLD",
                 "HPX_USE_CMAKE_CXX_STANDARD": "TRUE",
                 "HPX_WITH_EXAMPLES": "FALSE",
                 "HPX_WITH_FETCH_ASIO": "TRUE",

diff --git a/environment/conda/bld.bat b/environment/conda/bld.bat
@@ -6,7 +6,6 @@ if errorlevel 1 exit /b 1
 cmake -S . -B build %CMAKE_ARGS% ^
     --preset lue_release_windows_node ^
     -G Ninja ^
-    -D CMAKE_POLICY_DEFAULT_CMP0167=OLD ^
     -D CMAKE_INSTALL_LIBDIR=lib ^
     -D LUE_INSTALL_PYTHON_PACKAGE_DIR="%SP_DIR%/lue" ^
     -D LUE_DATA_MODEL_WITH_PYTHON_API=TRUE ^

diff --git a/environment/conda/build.sh b/environment/conda/build.sh
@@ -13,7 +13,6 @@ fi
 cmake -S . -B build $CMAKE_ARGS \
     --preset $lue_preset \
     -G Ninja \
-    -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
     -D LUE_INSTALL_PYTHON_PACKAGE_DIR="${SP_DIR}/lue" \
     -D LUE_DATA_MODEL_WITH_PYTHON_API=TRUE \
     -D LUE_DATA_MODEL_WITH_UTILITIES=TRUE \