From 652a5a357a8c8da5e84f378938d8f0a0b47dfaa3 Mon Sep 17 00:00:00 2001 From: Max Freedom Pollard <272618364+MaxFreedomPollard@users.noreply.github.com> Date: Sat, 19 Sep 2026 02:53:59 -0400 Subject: [PATCH] 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 --- cmake/NVBenchRapidsCMake.cmake | 2 +- cmake/RAPIDS.cmake | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/cmake/NVBenchRapidsCMake.cmake b/cmake/NVBenchRapidsCMake.cmake index 4f33a2b8..b6f6d7a5 100644 --- a/cmake/NVBenchRapidsCMake.cmake +++ b/cmake/NVBenchRapidsCMake.cmake @@ -2,7 +2,7 @@ macro(nvbench_load_rapids_cmake version) # - Including directly, see https://github.com/rapidsai/rmm/pull/1886 # - Versioned download URL: - # https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-XX.YY/RAPIDS.cmake + # https://raw.githubusercontent.com/rapidsai/rapids-cmake/release/XX.YY/RAPIDS.cmake # - This macro is always called before project() in the root CMakeLists.txt, so: # - we can't just use NVBench_SOURCE_DIR, it's not defined yet. # - We can't rely on CMAKE_CURRENT_LIST_DIR because of macro expansion. diff --git a/cmake/RAPIDS.cmake b/cmake/RAPIDS.cmake index 73585d8e..b2823563 100644 --- a/cmake/RAPIDS.cmake +++ b/cmake/RAPIDS.cmake @@ -1,18 +1,9 @@ -#============================================================================= -# Copyright (c) 2021-2025, NVIDIA CORPORATION. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= +# ============================================================================= +# cmake-format: off +# SPDX-FileCopyrightText: Copyright (c) 2021-2025, NVIDIA CORPORATION. +# SPDX-License-Identifier: Apache-2.0 +# cmake-format: on +# ============================================================================= # # This is the preferred entry point for projects using rapids-cmake # @@ -34,7 +25,7 @@ endif() # Allow users to control which branch is fetched if(NOT rapids-cmake-branch) # Define a default branch if the user doesn't set one - set(rapids-cmake-branch "branch-${rapids-cmake-version}") + set(rapids-cmake-branch "release/${rapids-cmake-version}") endif() # Allow users to control the exact URL passed to FetchContent