Skip to content

Commit a8288b5

Browse files
robertmaynardrobertmaynard
authored
Require CMake 3.30.4, and latest CPM (#753)
By requiring CMake 3.30.4+ we remove all the CPM related policy deprecation warnings that rapids-cmake users see. Fixes #680 Authors: - Robert Maynard (https://github.com/robertmaynard) - Bradley Dice (https://github.com/bdice) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) - Bradley Dice (https://github.com/bdice) URL: #753
1 parent 17f21fa commit a8288b5

File tree

80 files changed

+156
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+156
-157
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
2525
# cases it can fail due to CMAKE_MODULE_PREFIX not being exported properly
2626

2727
# Enforce the minimum required CMake version for all users
28-
cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
28+
cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
2929

3030
set(rapids-cmake-dir "${CMAKE_CURRENT_LIST_DIR}/rapids-cmake")
3131
if(NOT DEFINED CACHE{rapids-cmake-dir})

‎conda/recipes/rapids_core_dependencies/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2022-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#=============================================================================
16-
cmake_minimum_required(VERSION 3.26.4)
16+
cmake_minimum_required(VERSION 3.30.4)
1717

1818
project(rapids-dependencies LANGUAGES CXX)
1919

‎conda/recipes/rapids_core_dependencies/conda_build_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cuda_compiler:
77
- nvcc # [os.environ.get("RAPIDS_CUDA_VERSION", "").startswith("11")]
88

99
cmake_version:
10-
- ">=3.26.4"
10+
- ">=3.30.4"
1111

1212
c_stdlib:
1313
- sysroot

‎dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies:
2828
common:
2929
- output_types: [conda, requirements]
3030
packages:
31-
- cmake>=3.26.4
31+
- cmake>=3.30.4
3232
- ninja
3333
- output_types: conda
3434
packages:

‎example/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
#=============================================================================
1616

17-
cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
17+
cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
1818

1919
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/EXAMPLE_RAPIDS.cmake)
2020
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.10/RAPIDS.cmake

‎rapids-cmake/cpm/detail/download.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -52,8 +52,8 @@ function(rapids_cpm_download)
5252
list(APPEND CMAKE_MESSAGE_CONTEXT "rapids.cpm.download")
5353

5454
# When changing version verify no new variables needs to be propagated
55-
set(CPM_DOWNLOAD_VERSION 0.40.0)
56-
set(CPM_DOWNLOAD_MD5_HASH 6c9866a0aa0f804a36fe8c3866fb8a2c)
55+
set(CPM_DOWNLOAD_VERSION 0.40.2)
56+
set(CPM_DOWNLOAD_MD5_HASH 4d51aa9dab6104fad39c5b7a692d5e1c)
5757

5858
if(NOT DEFINED CPM_DOWNLOAD_LOCATION)
5959
if(CPM_SOURCE_CACHE)

‎rapids-cmake/cpm/package_override.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -122,7 +122,7 @@ function(rapids_cpm_package_override _rapids_override_filepath)
122122
rapids_cpm_generate_patch_command(${package_name} ${version} patch_command)
123123

124124
unset(exclude_from_all)
125-
if(exclude AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.28.0)
125+
if(exclude)
126126
set(exclude_from_all EXCLUDE_FROM_ALL)
127127
endif()
128128
FetchContent_Declare(${package_proper_name}

‎rapids-cmake/test/detail/generate_resource_spec/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2024-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#=============================================================================
16-
cmake_minimum_required(VERSION 3.26.4)
16+
cmake_minimum_required(VERSION 3.30.4)
1717
project(generate_resource_spec ${lang})
1818

1919
set(CMAKE_CUDA_ARCHITECTURES all)

‎rapids-cmake/test/detail/run_gpu_test.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2022-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#=============================================================================
16-
cmake_minimum_required(VERSION 3.26.4)
16+
cmake_minimum_required(VERSION 3.30.4)
1717

1818
if(DEFINED ENV{CTEST_RESOURCE_GROUP_COUNT})
1919
# cmake-lint: disable=E1120

‎testing/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
#=============================================================================
1616

17-
cmake_minimum_required(VERSION 3.26.4 FATAL_ERROR)
17+
cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
1818
project(rapids-cmake-testing LANGUAGES NONE)
1919

2020
enable_testing()

‎testing/cmake/write_git_revision-custom-prefix/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
#=============================================================================
1616
include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake)
1717

18-
cmake_minimum_required(VERSION 3.26.4)
18+
cmake_minimum_required(VERSION 3.30.4)
1919

2020
project(DEMO VERSION 2.4 LANGUAGES CXX)
2121
rapids_cmake_write_git_revision_file(demo_version "${CMAKE_CURRENT_BINARY_DIR}/demo/demo_git_version.hpp")

‎testing/cmake/write_git_revision-dirty/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
#=============================================================================
1616
include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake)
1717

18-
cmake_minimum_required(VERSION 3.26.4)
18+
cmake_minimum_required(VERSION 3.30.4)
1919

2020
project(DEMO VERSION 2.4 LANGUAGES CXX)
2121

‎testing/cmake/write_git_revision-embed/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
#=============================================================================
1616
include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake)
1717

18-
cmake_minimum_required(VERSION 3.26.4)
18+
cmake_minimum_required(VERSION 3.30.4)
1919

2020
project(DEMO VERSION 2.4 LANGUAGES CXX)
2121
rapids_cmake_write_git_revision_file(git_generated_header "${CMAKE_CURRENT_BINARY_DIR}/demo/git_version.hpp")

‎testing/cmake/write_git_revision-embed/verify_embedding.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#=============================================================================
16-
cmake_minimum_required(VERSION 3.26.4)
16+
cmake_minimum_required(VERSION 3.30.4)
1717
file(STRINGS "${EXECUTABLE}" contents)
1818

1919
execute_process(

‎testing/cmake/write_git_revision-no-git/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
#=============================================================================
1616
include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake)
1717

18-
cmake_minimum_required(VERSION 3.26.4)
18+
cmake_minimum_required(VERSION 3.30.4)
1919

2020
project(DEMO VERSION 2.4 LANGUAGES CXX)
2121

‎testing/cmake/write_git_revision-no-git/verify_embedding.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#=============================================================================
16-
cmake_minimum_required(VERSION 3.26.4)
16+
cmake_minimum_required(VERSION 3.30.4)
1717
file(STRINGS "${EXECUTABLE}" contents)
1818

1919
execute_process(

‎testing/cmake/write_git_revision-simple/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616
include(${rapids-cmake-dir}/cmake/write_git_revision_file.cmake)
1717
include(${rapids-cmake-dir}/export/export.cmake)
1818

19-
cmake_minimum_required(VERSION 3.26.4)
19+
cmake_minimum_required(VERSION 3.30.4)
2020

2121
project(DEMO VERSION 2.4 LANGUAGES CXX)
2222
rapids_cmake_write_git_revision_file(demo_version "${CMAKE_CURRENT_BINARY_DIR}/demo/demo_git_version.hpp")

‎testing/cmake/write_version-absolute/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
#=============================================================================
1616
include(${rapids-cmake-dir}/cmake/write_version_file.cmake)
1717

18-
cmake_minimum_required(VERSION 3.26.4)
18+
cmake_minimum_required(VERSION 3.30.4)
1919

2020
project(DEMO VERSION 2.4 LANGUAGES NONE)
2121
rapids_cmake_write_version_file("${CMAKE_CURRENT_BINARY_DIR}/demo/version.h")

‎testing/cmake/write_version-all-zeroes/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
#=============================================================================
1616
include(${rapids-cmake-dir}/cmake/write_version_file.cmake)
1717

18-
cmake_minimum_required(VERSION 3.26.4)
18+
cmake_minimum_required(VERSION 3.30.4)
1919

2020
project(DEMO VERSION 0.0000.1 LANGUAGES NONE)
2121
rapids_cmake_write_version_file(version.h)

‎testing/cmake/write_version-custom-prefix/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
#=============================================================================
1616
include(${rapids-cmake-dir}/cmake/write_version_file.cmake)
1717

18-
cmake_minimum_required(VERSION 3.26.4)
18+
cmake_minimum_required(VERSION 3.30.4)
1919

2020
project(RandomProjectName VERSION 3.2.0 LANGUAGES NONE)
2121
rapids_cmake_write_version_file(demo_version.hpp PREFIX DEMO)

‎testing/cmake/write_version-leading-zeroes/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
1515
#=============================================================================
1616
include(${rapids-cmake-dir}/cmake/write_version_file.cmake)
1717

18-
cmake_minimum_required(VERSION 3.26.4)
18+
cmake_minimum_required(VERSION 3.30.4)
1919

2020
project(DEMO VERSION 09.00008.02 LANGUAGES NONE)
2121
rapids_cmake_write_version_file(version.h)

‎testing/cmake/write_version-relative/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616
include(${rapids-cmake-dir}/cmake/write_version_file.cmake)
1717
include(${rapids-cmake-testing-dir}/utils/check_copyright_header.cmake)
1818

19-
cmake_minimum_required(VERSION 3.26.4)
19+
cmake_minimum_required(VERSION 3.30.4)
2020

2121
project(DEMO VERSION 3.2.0 LANGUAGES NONE)
2222
rapids_cmake_write_version_file(demo_version.hpp)

‎testing/cpm/cpm_bs_thread_pool-build-config-works.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2024-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ rapids_cpm_bs_thread_pool(BUILD_EXPORT_SET test)
2222
# Add a custom command that verifies that the expect files have
2323
# been installed for each component
2424
file(WRITE "${CMAKE_BINARY_DIR}/check_bs_thread_pool_dir/CMakeLists.txt" "
25-
cmake_minimum_required(VERSION 3.26.4)
25+
cmake_minimum_required(VERSION 3.30.4)
2626
project(verify_bs_thread_pool LANGUAGES CXX)
2727
2828
set(CMAKE_PREFIX_PATH \"${CMAKE_BINARY_DIR}/\")

‎testing/cpm/cpm_bs_thread_pool-install-config-works.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2024-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ rapids_cpm_bs_thread_pool(BUILD_EXPORT_SET test)
2222
# Add a custom command that verifies that the expect files have
2323
# been installed for each component
2424
file(WRITE "${CMAKE_BINARY_DIR}/check_bs_thread_pool_dir/CMakeLists.txt" "
25-
cmake_minimum_required(VERSION 3.26.4)
25+
cmake_minimum_required(VERSION 3.30.4)
2626
project(verify_bs_thread_pool LANGUAGES CXX)
2727
2828
set(CMAKE_PREFIX_PATH \"${CMAKE_BINARY_DIR}/\")

‎testing/cpm/cpm_find-add-pkg-source/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2021-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616
include(${rapids-cmake-dir}/cpm/init.cmake)
1717
include(${rapids-cmake-dir}/cpm/find.cmake)
1818

19-
cmake_minimum_required(VERSION 3.26.4)
19+
cmake_minimum_required(VERSION 3.30.4)
2020
project(rapids-cpm-find-add-pkg-source LANGUAGES CXX)
2121

2222
set(CPM_ZLIB_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/mock_zlib_source_dir")

0 commit comments

Comments
 (0)