Skip to content

Commit 652a5a3

Browse files
Sync the vendored RAPIDS.cmake with rapids-cmake release/25.12
The vendored copy still defaulted to the branch-XX.YY naming. rapids-cmake has since moved its release branches to release/XX.YY, and GitHub now redirects branch-25.12 to main. NVBench therefore fetched rapids-cmake main instead of 25.12, and main requires CMake 4.0, so configuring with the documented CMake 3.30.4 or any 3.x failed. The release/25.12 copy of RAPIDS.cmake defaults to release/XX.YY. It differs from the vendored one only in that line and in the license header. Fixes #465
1 parent 410dcdd commit 652a5a3

2 files changed

Lines changed: 8 additions & 17 deletions

File tree

‎cmake/NVBenchRapidsCMake.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
macro(nvbench_load_rapids_cmake version)
33
# - Including directly, see https://github.com/rapidsai/rmm/pull/1886
44
# - Versioned download URL:
5-
# https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-XX.YY/RAPIDS.cmake
5+
# https://raw.githubusercontent.com/rapidsai/rapids-cmake/release/XX.YY/RAPIDS.cmake
66
# - This macro is always called before project() in the root CMakeLists.txt, so:
77
# - we can't just use NVBench_SOURCE_DIR, it's not defined yet.
88
# - We can't rely on CMAKE_CURRENT_LIST_DIR because of macro expansion.

‎cmake/RAPIDS.cmake‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
#=============================================================================
2-
# Copyright (c) 2021-2025, NVIDIA CORPORATION.
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
#=============================================================================
1+
# =============================================================================
2+
# cmake-format: off
3+
# SPDX-FileCopyrightText: Copyright (c) 2021-2025, NVIDIA CORPORATION.
4+
# SPDX-License-Identifier: Apache-2.0
5+
# cmake-format: on
6+
# =============================================================================
167
#
178
# This is the preferred entry point for projects using rapids-cmake
189
#
@@ -34,7 +25,7 @@ endif()
3425
# Allow users to control which branch is fetched
3526
if(NOT rapids-cmake-branch)
3627
# Define a default branch if the user doesn't set one
37-
set(rapids-cmake-branch "branch-${rapids-cmake-version}")
28+
set(rapids-cmake-branch "release/${rapids-cmake-version}")
3829
endif()
3930

4031
# Allow users to control the exact URL passed to FetchContent

0 commit comments

Comments
 (0)