diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d79e31a..2be180b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ # cases it can fail due to CMAKE_MODULE_PREFIX not being exported properly # Enfore the minimum required CMake version for all users -cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) set(rapids-cmake-dir "${CMAKE_CURRENT_LIST_DIR}/rapids-cmake") if(NOT DEFINED CACHE{rapids-cmake-dir}) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index ebb28fe1..715a0c1c 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -14,7 +14,7 @@ # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.18 FATAL_ERROR) +cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/EXAMPLE_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake diff --git a/rapids-cmake/cmake/build_type.cmake b/rapids-cmake/cmake/build_type.cmake index da6e117a..e977c509 100644 --- a/rapids-cmake/cmake/build_type.cmake +++ b/rapids-cmake/cmake/build_type.cmake @@ -28,7 +28,8 @@ Establish the :cmake:variable:`CMAKE_BUILD_TYPE` default value. rapids_cmake_build_type(default_type) If the generator is `Ninja` or `Makefile` the :cmake:variable:`CMAKE_BUILD_TYPE` -variable will be established if not explicitly set by the user. This removes +variable will be established if not explicitly set by the user either by +the env variable `CMAKE_BUILD_TYPE` or by passing `-DCMAKE_BUILD_TYPE=`. This removes situations where the `No-Config` / `Empty` build type is used. ``default_type`` diff --git a/rapids-cmake/cmake/install_lib_dir.cmake b/rapids-cmake/cmake/install_lib_dir.cmake index 9f5adeb3..4efd619b 100644 --- a/rapids-cmake/cmake/install_lib_dir.cmake +++ b/rapids-cmake/cmake/install_lib_dir.cmake @@ -53,54 +53,25 @@ function(rapids_cmake_install_lib_dir out_variable_name) cmake_path(ABSOLUTE_PATH install_prefix NORMALIZE) set(use_conda_lib_dir FALSE) - if(CMAKE_VERSION VERSION_LESS 3.22) - # Starting with 3.22, CMake is fully aware of the conda 'lib' requirements so we don't need to - # do this check at all - if(DEFINED ENV{CONDA_BUILD} AND DEFINED ENV{PREFIX}) - set(conda_prefix "$ENV{PREFIX}") - cmake_path(ABSOLUTE_PATH conda_prefix NORMALIZE) - if(install_prefix STREQUAL conda_prefix) - set(use_conda_lib_dir TRUE) - endif() - elseif(DEFINED ENV{CONDA_PREFIX}) - set(conda_prefix "$ENV{CONDA_PREFIX}") - cmake_path(ABSOLUTE_PATH conda_prefix NORMALIZE) - if(install_prefix STREQUAL conda_prefix) - set(use_conda_lib_dir TRUE) - endif() - endif() - endif() set(computed_path) - if(use_conda_lib_dir) - # CONDA requires everything to be installed to 'lib' no matter the distro - set(computed_path "lib") - if(modify_install_libdir) - # GNUInstallDirs sets `CMAKE_INSTALL_LIBDIR` as a cache path, so we need to do that as well - set(CMAKE_INSTALL_LIBDIR ${computed_path} CACHE PATH - "Object code libraries (${computed_path})") - - # Make sure our path overrides any local variable - set(CMAKE_INSTALL_LIBDIR ${computed_path} PARENT_SCOPE) - endif() - else() - # We need to defer to GNUInstallDirs but not allow it to set CMAKE_INSTALL_LIBDIR - set(remove_install_dir TRUE) - if(DEFINED CMAKE_INSTALL_LIBDIR) - set(remove_install_dir FALSE) - endif() - - include(GNUInstallDirs) - set(computed_path "${CMAKE_INSTALL_LIBDIR}") - if(modify_install_libdir) - # GNUInstallDirs will have set `CMAKE_INSTALL_LIBDIR` as a cache path So we only need to make - # sure our path overrides any local variable - set(CMAKE_INSTALL_LIBDIR ${computed_path} PARENT_SCOPE) - endif() - - if(remove_install_dir) - unset(CMAKE_INSTALL_LIBDIR CACHE) - endif() + + # We need to defer to GNUInstallDirs but not allow it to set CMAKE_INSTALL_LIBDIR + set(remove_install_dir TRUE) + if(DEFINED CMAKE_INSTALL_LIBDIR) + set(remove_install_dir FALSE) + endif() + + include(GNUInstallDirs) + set(computed_path "${CMAKE_INSTALL_LIBDIR}") + if(modify_install_libdir) + # GNUInstallDirs will have set `CMAKE_INSTALL_LIBDIR` as a cache path so we only need to make + # sure our path overrides any local variable + set(CMAKE_INSTALL_LIBDIR ${computed_path} PARENT_SCOPE) + endif() + + if(remove_install_dir) + unset(CMAKE_INSTALL_LIBDIR CACHE) endif() set(${out_variable_name} ${computed_path} PARENT_SCOPE) diff --git a/rapids-cmake/cpm/gtest.cmake b/rapids-cmake/cpm/gtest.cmake index d6237c64..bc389839 100644 --- a/rapids-cmake/cpm/gtest.cmake +++ b/rapids-cmake/cpm/gtest.cmake @@ -59,17 +59,10 @@ function(rapids_cpm_gtest) include("${rapids-cmake-dir}/cpm/detail/package_details.cmake") rapids_cpm_package_details(GTest version repository tag shallow exclude) - set(EXTRA_CPM_ARGS) - if(CMAKE_VERSION VERSION_LESS 3.23) - # CMake 3.23+ built-in FindGTest is required to have the GTest::gmock_main and GTest::gmock - # targets so always use gtest-config.cmake for now - string(APPEND EXTRA_CPM_ARGS "NO_MODULE") - endif() - include("${rapids-cmake-dir}/cpm/find.cmake") rapids_cpm_find(GTest ${version} ${ARGN} GLOBAL_TARGETS GTest::gtest GTest::gmock GTest::gtest_main GTest::gmock_main - CPM_ARGS FIND_PACKAGE_ARGUMENTS "EXACT ${EXTRA_CPM_ARGS}" + CPM_ARGS FIND_PACKAGE_ARGUMENTS "EXACT" GIT_REPOSITORY ${repository} GIT_TAG ${tag} GIT_SHALLOW ${shallow} diff --git a/rapids-cmake/cpm/rmm.cmake b/rapids-cmake/cpm/rmm.cmake index 94e08bec..27ea978f 100644 --- a/rapids-cmake/cpm/rmm.cmake +++ b/rapids-cmake/cpm/rmm.cmake @@ -69,8 +69,7 @@ function(rapids_cpm_rmm) endif() include("${rapids-cmake-dir}/cpm/find.cmake") - # Once we can require CMake 3.22 this can use `only_major_minor` for version searches - rapids_cpm_find(rmm "${version}.0" ${_RAPIDS_UNPARSED_ARGUMENTS} + rapids_cpm_find(rmm ${version} ${ARGN} {_RAPIDS_UNPARSED_ARGUMENTS} GLOBAL_TARGETS rmm::rmm CPM_ARGS GIT_REPOSITORY ${repository} diff --git a/rapids-cmake/export/detail/parse_version.cmake b/rapids-cmake/export/detail/parse_version.cmake index eeb86f19..d297cbff 100644 --- a/rapids-cmake/export/detail/parse_version.cmake +++ b/rapids-cmake/export/detail/parse_version.cmake @@ -24,22 +24,29 @@ function(rapids_export_parse_version rapids_version orig_prefix ver_value) rapids_cmake_parse_version(MINOR "${rapids_version}" orig_minor_version) rapids_cmake_parse_version(PATCH "${rapids_version}" orig_patch_version) - # Generate an explicit VERSION string without zeroes to work around: - # https://gitlab.kitware.com/cmake/cmake/-/issues/22207 set(version_compat SameMajorVersion) if(DEFINED orig_major_version) - math(EXPR rapids_major_version "${orig_major_version} + 0" OUTPUT_FORMAT DECIMAL) + set(rapids_major_version "${orig_major_version}") + if(rapids_major_version MATCHES "^0+$") + set(rapids_major_version "0") + endif() string(APPEND rapids_project_version "${rapids_major_version}") endif() if(DEFINED orig_minor_version) - math(EXPR rapids_minor_version "${orig_minor_version} + 0" OUTPUT_FORMAT DECIMAL) + set(rapids_minor_version "${orig_minor_version}") + if(rapids_minor_version MATCHES "^0+$") + set(rapids_minor_version "0") + endif() string(APPEND rapids_project_version ".${rapids_minor_version}") set(version_compat SameMinorVersion) endif() if(DEFINED orig_patch_version) - math(EXPR rapids_patch_version "${orig_patch_version} + 0" OUTPUT_FORMAT DECIMAL) + set(rapids_patch_version "${orig_patch_version}") + if(rapids_patch_version MATCHES "^0+$") + set(rapids_patch_version "0") + endif() string(APPEND rapids_project_version ".${rapids_patch_version}") set(version_compat SameMinorVersion) endif() diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index 60173988..05733ab0 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -14,7 +14,7 @@ # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20 FATAL_ERROR) +cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) project(rapids-cmake-testing LANGUAGES NONE) enable_testing() diff --git a/testing/cmake/write_git_revision-custom-prefix/CMakeLists.txt b/testing/cmake/write_git_revision-custom-prefix/CMakeLists.txt index 91bfc8dc..6aec164b 100644 --- a/testing/cmake/write_git_revision-custom-prefix/CMakeLists.txt +++ b/testing/cmake/write_git_revision-custom-prefix/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(DEMO VERSION 2.4 LANGUAGES CXX) rapids_cmake_write_git_revision_file(demo_version "${CMAKE_CURRENT_BINARY_DIR}/demo/demo_git_version.hpp") diff --git a/testing/cmake/write_git_revision-dirty/CMakeLists.txt b/testing/cmake/write_git_revision-dirty/CMakeLists.txt index e71cd7c9..2d998988 100644 --- a/testing/cmake/write_git_revision-dirty/CMakeLists.txt +++ b/testing/cmake/write_git_revision-dirty/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(DEMO VERSION 2.4 LANGUAGES CXX) diff --git a/testing/cmake/write_git_revision-embed/CMakeLists.txt b/testing/cmake/write_git_revision-embed/CMakeLists.txt index 56d0d5c5..729817cd 100644 --- a/testing/cmake/write_git_revision-embed/CMakeLists.txt +++ b/testing/cmake/write_git_revision-embed/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(DEMO VERSION 2.4 LANGUAGES CXX) rapids_cmake_write_git_revision_file(git_generated_header "${CMAKE_CURRENT_BINARY_DIR}/demo/git_version.hpp") diff --git a/testing/cmake/write_git_revision-embed/verify_embedding.cmake b/testing/cmake/write_git_revision-embed/verify_embedding.cmake index c5acb988..db5d7ec1 100644 --- a/testing/cmake/write_git_revision-embed/verify_embedding.cmake +++ b/testing/cmake/write_git_revision-embed/verify_embedding.cmake @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) file(STRINGS "${EXECUTABLE}" contents) execute_process( diff --git a/testing/cmake/write_git_revision-no-git/CMakeLists.txt b/testing/cmake/write_git_revision-no-git/CMakeLists.txt index 8174edef..7f3ec03a 100644 --- a/testing/cmake/write_git_revision-no-git/CMakeLists.txt +++ b/testing/cmake/write_git_revision-no-git/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(DEMO VERSION 2.4 LANGUAGES CXX) diff --git a/testing/cmake/write_git_revision-no-git/verify_embedding.cmake b/testing/cmake/write_git_revision-no-git/verify_embedding.cmake index c5acb988..db5d7ec1 100644 --- a/testing/cmake/write_git_revision-no-git/verify_embedding.cmake +++ b/testing/cmake/write_git_revision-no-git/verify_embedding.cmake @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) file(STRINGS "${EXECUTABLE}" contents) execute_process( diff --git a/testing/cmake/write_git_revision-simple/CMakeLists.txt b/testing/cmake/write_git_revision-simple/CMakeLists.txt index 16fc833f..d6415185 100644 --- a/testing/cmake/write_git_revision-simple/CMakeLists.txt +++ b/testing/cmake/write_git_revision-simple/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(DEMO VERSION 2.4 LANGUAGES CXX) rapids_cmake_write_git_revision_file(demo_version "${CMAKE_CURRENT_BINARY_DIR}/demo/demo_git_version.hpp") diff --git a/testing/cmake/write_version-absolute/CMakeLists.txt b/testing/cmake/write_version-absolute/CMakeLists.txt index 2bf57686..155c4285 100644 --- a/testing/cmake/write_version-absolute/CMakeLists.txt +++ b/testing/cmake/write_version-absolute/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_version_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(DEMO VERSION 2.4 LANGUAGES NONE) rapids_cmake_write_version_file("${CMAKE_CURRENT_BINARY_DIR}/demo/version.h") diff --git a/testing/cmake/write_version-all-zeroes/CMakeLists.txt b/testing/cmake/write_version-all-zeroes/CMakeLists.txt index b8a06086..b0370339 100644 --- a/testing/cmake/write_version-all-zeroes/CMakeLists.txt +++ b/testing/cmake/write_version-all-zeroes/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_version_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(DEMO VERSION 0.0000.1 LANGUAGES NONE) rapids_cmake_write_version_file(version.h) diff --git a/testing/cmake/write_version-custom-prefix/CMakeLists.txt b/testing/cmake/write_version-custom-prefix/CMakeLists.txt index 22a56968..2e5b6962 100644 --- a/testing/cmake/write_version-custom-prefix/CMakeLists.txt +++ b/testing/cmake/write_version-custom-prefix/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_version_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(RandomProjectName VERSION 3.2.0 LANGUAGES NONE) rapids_cmake_write_version_file(demo_version.hpp PREFIX DEMO) diff --git a/testing/cmake/write_version-leading-zeroes/CMakeLists.txt b/testing/cmake/write_version-leading-zeroes/CMakeLists.txt index 2327824b..36341316 100644 --- a/testing/cmake/write_version-leading-zeroes/CMakeLists.txt +++ b/testing/cmake/write_version-leading-zeroes/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_version_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(DEMO VERSION 09.00008.02 LANGUAGES NONE) rapids_cmake_write_version_file(version.h) @@ -23,4 +23,4 @@ rapids_cmake_write_version_file(version.h) enable_language(CXX) add_executable(write_version main.cpp) target_include_directories(write_version PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") -target_compile_features(write_version PRIVATE cxx_std_14) \ No newline at end of file +target_compile_features(write_version PRIVATE cxx_std_14) diff --git a/testing/cmake/write_version-relative/CMakeLists.txt b/testing/cmake/write_version-relative/CMakeLists.txt index e4fb94dc..5e4705f1 100644 --- a/testing/cmake/write_version-relative/CMakeLists.txt +++ b/testing/cmake/write_version-relative/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cmake/write_version_file.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(DEMO VERSION 3.2.0 LANGUAGES NONE) rapids_cmake_write_version_file(demo_version.hpp) @@ -26,4 +26,4 @@ rapids_cmake_write_version_file(nested_version.hpp) enable_language(CXX) add_executable(write_version main.cpp) target_include_directories(write_version PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") -target_compile_features(write_version PRIVATE cxx_std_14) \ No newline at end of file +target_compile_features(write_version PRIVATE cxx_std_14) diff --git a/testing/cpm/cpm_find-add-pkg-source/CMakeLists.txt b/testing/cpm/cpm_find-add-pkg-source/CMakeLists.txt index 6dafef5b..a3bbdfa6 100644 --- a/testing/cpm/cpm_find-add-pkg-source/CMakeLists.txt +++ b/testing/cpm/cpm_find-add-pkg-source/CMakeLists.txt @@ -16,7 +16,7 @@ include(${rapids-cmake-dir}/cpm/init.cmake) include(${rapids-cmake-dir}/cpm/find.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-cpm-find-add-pkg-source LANGUAGES CXX) set(CPM_ZLIB_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/mock_zlib_source_dir") diff --git a/testing/cpm/cpm_find-add-pkg-source/mock_zlib_source_dir/CMakeLists.txt b/testing/cpm/cpm_find-add-pkg-source/mock_zlib_source_dir/CMakeLists.txt index d40ba66e..dbdd1b2a 100644 --- a/testing/cpm/cpm_find-add-pkg-source/mock_zlib_source_dir/CMakeLists.txt +++ b/testing/cpm/cpm_find-add-pkg-source/mock_zlib_source_dir/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(ZLIB LANGUAGES CXX) add_library(MOCK_ZLIB INTERFACE) diff --git a/testing/cpm/cpm_find-and-find_package/CMakeLists.txt b/testing/cpm/cpm_find-and-find_package/CMakeLists.txt index f07759d1..148cd34b 100644 --- a/testing/cpm/cpm_find-and-find_package/CMakeLists.txt +++ b/testing/cpm/cpm_find-and-find_package/CMakeLists.txt @@ -16,7 +16,7 @@ include(${rapids-cmake-dir}/cpm/init.cmake) include(${rapids-cmake-dir}/cpm/find.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) diff --git a/testing/cpm/cpm_find-and-find_package/mock_cucxx_source_dir/CMakeLists.txt b/testing/cpm/cpm_find-and-find_package/mock_cucxx_source_dir/CMakeLists.txt index b212f75e..8eef93fe 100644 --- a/testing/cpm/cpm_find-and-find_package/mock_cucxx_source_dir/CMakeLists.txt +++ b/testing/cpm/cpm_find-and-find_package/mock_cucxx_source_dir/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(mock_cucxx LANGUAGES CXX) add_library(MOCK_CUCXX INTERFACE) diff --git a/testing/cpm/cpm_find-existing-build-dir/CMakeLists.txt b/testing/cpm/cpm_find-existing-build-dir/CMakeLists.txt index bda1af24..d5cde6e5 100644 --- a/testing/cpm/cpm_find-existing-build-dir/CMakeLists.txt +++ b/testing/cpm/cpm_find-existing-build-dir/CMakeLists.txt @@ -16,7 +16,7 @@ include(${rapids-cmake-dir}/cpm/init.cmake) include(${rapids-cmake-dir}/cpm/find.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) include("${rapids-cmake-testing-dir}/cpm/make_fake_project_build_dir_with_config.cmake") diff --git a/testing/cpm/cpm_find-existing-target-to-export-sets/CMakeLists.txt b/testing/cpm/cpm_find-existing-target-to-export-sets/CMakeLists.txt index a109f86c..0d851a41 100644 --- a/testing/cpm/cpm_find-existing-target-to-export-sets/CMakeLists.txt +++ b/testing/cpm/cpm_find-existing-target-to-export-sets/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) include(${rapids-cmake-dir}/cpm/init.cmake) include(${rapids-cmake-dir}/cpm/find.cmake) diff --git a/testing/cpm/cpm_find-existing-target/CMakeLists.txt b/testing/cpm/cpm_find-existing-target/CMakeLists.txt index b4679233..55abea46 100644 --- a/testing/cpm/cpm_find-existing-target/CMakeLists.txt +++ b/testing/cpm/cpm_find-existing-target/CMakeLists.txt @@ -16,7 +16,7 @@ include(${rapids-cmake-dir}/cpm/init.cmake) include(${rapids-cmake-dir}/cpm/find.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-existing-target LANGUAGES CXX) include("${rapids-cmake-testing-dir}/cpm/make_fake_project_build_dir_with_config.cmake") diff --git a/testing/cpm/cpm_find-options-escaped/CMakeLists.txt b/testing/cpm/cpm_find-options-escaped/CMakeLists.txt index 8a05ad74..0c497514 100644 --- a/testing/cpm/cpm_find-options-escaped/CMakeLists.txt +++ b/testing/cpm/cpm_find-options-escaped/CMakeLists.txt @@ -16,7 +16,7 @@ include(${rapids-cmake-dir}/cpm/init.cmake) include(${rapids-cmake-dir}/cpm/find.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) rapids_cpm_init() diff --git a/testing/cpm/cpm_find-options-escaped/rapidstest-config.cmake b/testing/cpm/cpm_find-options-escaped/rapidstest-config.cmake index 11345b7d..cccf52bf 100644 --- a/testing/cpm/cpm_find-options-escaped/rapidstest-config.cmake +++ b/testing/cpm/cpm_find-options-escaped/rapidstest-config.cmake @@ -15,7 +15,7 @@ #============================================================================= @PACKAGE_INIT@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) include("${CMAKE_CURRENT_LIST_DIR}/rapidstest-config-version.cmake") diff --git a/testing/cpm/cpm_find-restore-cpm-vars/CMakeLists.txt b/testing/cpm/cpm_find-restore-cpm-vars/CMakeLists.txt index 8bfe682d..07bb4199 100644 --- a/testing/cpm/cpm_find-restore-cpm-vars/CMakeLists.txt +++ b/testing/cpm/cpm_find-restore-cpm-vars/CMakeLists.txt @@ -16,7 +16,7 @@ include(${rapids-cmake-dir}/cpm/init.cmake) include(${rapids-cmake-dir}/cpm/find.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-cpm-find-add-pkg-source LANGUAGES CXX) set(CPM_ZLIB_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/mock_zlib_source_dir") diff --git a/testing/cpm/cpm_find-restore-cpm-vars/mock_zlib_source_dir/CMakeLists.txt b/testing/cpm/cpm_find-restore-cpm-vars/mock_zlib_source_dir/CMakeLists.txt index 1a82aa21..8e9cfc7d 100644 --- a/testing/cpm/cpm_find-restore-cpm-vars/mock_zlib_source_dir/CMakeLists.txt +++ b/testing/cpm/cpm_find-restore-cpm-vars/mock_zlib_source_dir/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(ZLIB LANGUAGES CXX VERSION 1.0) add_library(MOCK_ZLIB INTERFACE) diff --git a/testing/cuda/init_arch-all-via-undef/CMakeLists.txt b/testing/cuda/init_arch-all-via-undef/CMakeLists.txt index 01709aa5..e330111b 100644 --- a/testing/cuda/init_arch-all-via-undef/CMakeLists.txt +++ b/testing/cuda/init_arch-all-via-undef/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cuda/init_architectures.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) unset(CMAKE_CUDA_ARCHITECTURES ) diff --git a/testing/cuda/init_arch-native-via-empty-str/CMakeLists.txt b/testing/cuda/init_arch-native-via-empty-str/CMakeLists.txt index 17d896e7..19a8830e 100644 --- a/testing/cuda/init_arch-native-via-empty-str/CMakeLists.txt +++ b/testing/cuda/init_arch-native-via-empty-str/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/cuda/init_architectures.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) set(CMAKE_CUDA_ARCHITECTURES "") diff --git a/testing/export/export-verify-build-namespaces/CMakeLists.txt b/testing/export/export-verify-build-namespaces/CMakeLists.txt index 5e950bf9..6bb76d59 100644 --- a/testing/export/export-verify-build-namespaces/CMakeLists.txt +++ b/testing/export/export-verify-build-namespaces/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/export/export.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(FakEProJecT LANGUAGES CXX VERSION 3.1.4) add_library(fakeLib INTERFACE) @@ -31,7 +31,7 @@ rapids_export(BUILD FakEProJecT # that verifies our target was exported with the correct # namespace file(WRITE "${CMAKE_BINARY_DIR}/verify/CMakeLists.txt" [=[ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(verify_build_targets LANGUAGES CXX) message(STATUS "${CMAKE_CURRENT_LIST_DIR}/../fakeproject-targets.cmake") if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../fakeproject-targets.cmake") diff --git a/testing/export/export-verify-code-block/CMakeLists.txt b/testing/export/export-verify-code-block/CMakeLists.txt index e6fe4316..118be7c3 100644 --- a/testing/export/export-verify-code-block/CMakeLists.txt +++ b/testing/export/export-verify-code-block/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/export/export.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(FakEProJecT LANGUAGES CXX VERSION 3.1.4) add_library(fakeLib INTERFACE) @@ -36,7 +36,7 @@ rapids_export(BUILD FakEProJecT # that verifies our target was exported with the correct # namespace file(WRITE "${CMAKE_BINARY_DIR}/verify/CMakeLists.txt" [=[ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(verify_build_targets LANGUAGES CXX) message(STATUS "${CMAKE_CURRENT_LIST_DIR}/../fakeproject-config.cmake") if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../fakeproject-config.cmake") diff --git a/testing/export/export-verify-doc-string/CMakeLists.txt b/testing/export/export-verify-doc-string/CMakeLists.txt index 3fdcdd27..d49ac7ce 100644 --- a/testing/export/export-verify-doc-string/CMakeLists.txt +++ b/testing/export/export-verify-doc-string/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/export/export.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(FakEProJecT LANGUAGES CXX VERSION 3.1.4) add_library(fakeLib INTERFACE) @@ -36,7 +36,7 @@ rapids_export(BUILD FakEProJecT # that verifies our target was exported with the correct # namespace file(WRITE "${CMAKE_BINARY_DIR}/verify/CMakeLists.txt" [=[ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(verify_build_targets LANGUAGES CXX) message(STATUS "${CMAKE_CURRENT_LIST_DIR}/../fakeproject-config.cmake") if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../fakeproject-config.cmake") diff --git a/testing/export/export-verify-explicit-patch-version-value-of-zero.cmake b/testing/export/export-verify-explicit-patch-version-value-of-zero.cmake index a464803e..23c879f5 100644 --- a/testing/export/export-verify-explicit-patch-version-value-of-zero.cmake +++ b/testing/export/export-verify-explicit-patch-version-value-of-zero.cmake @@ -59,7 +59,7 @@ if(NOT "${TEST_VERSION_MAJOR}.${TEST_VERSION_MINOR}" VERSION_EQUAL 21.09) message(FATAL_ERROR "rapids_export failed to export version major/minor information") endif() -find_package(test 21.9.0 EXACT REQUIRED) +find_package(test 21.09.0 EXACT REQUIRED) if(NOT TEST_VERSION STREQUAL "21.09.0") message(FATAL_ERROR "rapids_export failed to export version information") endif() diff --git a/testing/export/export-verify-global-targets/CMakeLists.txt b/testing/export/export-verify-global-targets/CMakeLists.txt index e015de8e..dea357da 100644 --- a/testing/export/export-verify-global-targets/CMakeLists.txt +++ b/testing/export/export-verify-global-targets/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/export/export.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(FakEProJecT LANGUAGES CXX VERSION 3.1.4) add_library(fakeLib INTERFACE) @@ -32,7 +32,7 @@ rapids_export(BUILD FakEProJecT # that verifies our target was exported with the correct # namespace file(WRITE "${CMAKE_BINARY_DIR}/verify/CMakeLists.txt" [=[ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(verify_build_targets LANGUAGES CXX) message(STATUS "${CMAKE_CURRENT_LIST_DIR}/../fakeproject-config.cmake") if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/../fakeproject-config.cmake") diff --git a/testing/export/write_dependencies-multiple-directories/CMakeLists.txt b/testing/export/write_dependencies-multiple-directories/CMakeLists.txt index f0954266..b86f75a4 100644 --- a/testing/export/write_dependencies-multiple-directories/CMakeLists.txt +++ b/testing/export/write_dependencies-multiple-directories/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= #Needs to before inclusion of `cpm.cmake` -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) include(${rapids-cmake-dir}/export/cpm.cmake) include(${rapids-cmake-dir}/export/write_dependencies.cmake) diff --git a/testing/export/write_language-multiple-nested-enables/CMakeLists.txt b/testing/export/write_language-multiple-nested-enables/CMakeLists.txt index 6848f230..8698a4b9 100644 --- a/testing/export/write_language-multiple-nested-enables/CMakeLists.txt +++ b/testing/export/write_language-multiple-nested-enables/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/export/write_language.cmake) -cmake_minimum_required(VERSION 3.20 FATAL_ERROR) +cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) project(write_language-multiple-nested-enable LANGUAGES NONE) diff --git a/testing/export/write_language-nested-dirs/CMakeLists.txt b/testing/export/write_language-nested-dirs/CMakeLists.txt index 4acb602f..482f230c 100644 --- a/testing/export/write_language-nested-dirs/CMakeLists.txt +++ b/testing/export/write_language-nested-dirs/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/export/write_language.cmake) -cmake_minimum_required(VERSION 3.20 FATAL_ERROR) +cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR) project(write_language-nested-dirs LANGUAGES NONE) diff --git a/testing/find/find_generate_module-build/CMakeLists.txt b/testing/find/find_generate_module-build/CMakeLists.txt index 0d75ff88..5bb57a98 100644 --- a/testing/find/find_generate_module-build/CMakeLists.txt +++ b/testing/find/find_generate_module-build/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/find/generate_module.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/testing/find/find_generate_module-header-only/CMakeLists.txt b/testing/find/find_generate_module-header-only/CMakeLists.txt index 719d15e8..1d291812 100644 --- a/testing/find/find_generate_module-header-only/CMakeLists.txt +++ b/testing/find/find_generate_module-header-only/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/find/generate_module.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/testing/find/find_generate_module-install/CMakeLists.txt b/testing/find/find_generate_module-install/CMakeLists.txt index fa6ca06a..c90de4c2 100644 --- a/testing/find/find_generate_module-install/CMakeLists.txt +++ b/testing/find/find_generate_module-install/CMakeLists.txt @@ -15,7 +15,7 @@ #============================================================================= include(${rapids-cmake-dir}/find/generate_module.cmake) -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}") diff --git a/testing/other/FetchContent-hostile-legacy/CMakeLists.txt b/testing/other/FetchContent-hostile-legacy/CMakeLists.txt index c57da2ae..edbf4fd7 100644 --- a/testing/other/FetchContent-hostile-legacy/CMakeLists.txt +++ b/testing/other/FetchContent-hostile-legacy/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) cmake_path(GET rapids-cmake-dir PARENT_PATH rapids-git-dir) diff --git a/testing/other/FetchContent-legacy/CMakeLists.txt b/testing/other/FetchContent-legacy/CMakeLists.txt index 82fa0d47..c3da13a3 100644 --- a/testing/other/FetchContent-legacy/CMakeLists.txt +++ b/testing/other/FetchContent-legacy/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) cmake_path(GET rapids-cmake-dir PARENT_PATH rapids-root-dir) diff --git a/testing/other/rapids_cmake-multiple-cpm/CMakeLists.txt b/testing/other/rapids_cmake-multiple-cpm/CMakeLists.txt index 119952dc..75c4d2c0 100644 --- a/testing/other/rapids_cmake-multiple-cpm/CMakeLists.txt +++ b/testing/other/rapids_cmake-multiple-cpm/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) cmake_path(GET rapids-cmake-dir PARENT_PATH rapids.cmake-location) diff --git a/testing/other/rapids_cmake-multiple-simple/CMakeLists.txt b/testing/other/rapids_cmake-multiple-simple/CMakeLists.txt index 08ece3aa..ebfc3782 100644 --- a/testing/other/rapids_cmake-multiple-simple/CMakeLists.txt +++ b/testing/other/rapids_cmake-multiple-simple/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(rapids-test-project LANGUAGES CXX) cmake_path(GET rapids-cmake-dir PARENT_PATH rapids.cmake-location) diff --git a/testing/utils/fill_cache/CMakeLists.txt b/testing/utils/fill_cache/CMakeLists.txt index 7f82a42e..b344ec0e 100644 --- a/testing/utils/fill_cache/CMakeLists.txt +++ b/testing/utils/fill_cache/CMakeLists.txt @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.23.1) project(fill_cache LANGUAGES CXX) diff --git a/testing/utils/project_template.cmake.in b/testing/utils/project_template.cmake.in index f0b13778..f9b96569 100644 --- a/testing/utils/project_template.cmake.in +++ b/testing/utils/project_template.cmake.in @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.20.1) +cmake_minimum_required(VERSION 3.23.1) include(FetchContent)