File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ branch-25.10
Original file line number Diff line number Diff line change 1818cmake_minimum_required (VERSION 3.30.4 FATAL_ERROR )
1919
2020# Allow users to control which version is used
21- if (NOT rapids-cmake-version OR NOT rapids-cmake-version MATCHES [[ ^([0-9][0-9])\.([0-9][0-9])$ ]] )
21+ if (NOT rapids-cmake-branch OR NOT rapids-cmake-version)
2222 message (
23- FATAL_ERROR "The CMake variable rapids-cmake-version must be defined in the format MAJOR.MINOR. "
23+ FATAL_ERROR "The CMake variable ` rapids-cmake-branch` or `rapids-cmake- version` must be defined"
2424 )
2525endif ()
2626
@@ -33,7 +33,7 @@ endif()
3333# Allow users to control which branch is fetched
3434if (NOT rapids-cmake-branch)
3535 # Define a default branch if the user doesn't set one
36- set (rapids-cmake-branch "branch- ${rapids-cmake-version}" )
36+ set (rapids-cmake-branch "release/ ${rapids-cmake-version}" )
3737endif ()
3838
3939# Allow users to control the exact URL passed to FetchContent
Original file line number Diff line number Diff line change @@ -25,5 +25,15 @@ else()
2525 "Could not determine RAPIDS version. Contents of VERSION file:\n ${_rapids_version_formatted} " )
2626endif ()
2727
28+ # Use STRINGS to trim whitespace/newlines
29+ file (STRINGS "${CMAKE_CURRENT_LIST_DIR} /../RAPIDS_BRANCH" _rapids_branch )
30+ if (NOT _rapids_branch)
31+ message (
32+ FATAL_ERROR
33+ "Could not determine branch name to use for checking out rapids-cmake. The file \" ${CMAKE_CURRENT_LIST_DIR} /../RAPIDS_BRANCH\" is missing."
34+ )
35+ endif ()
36+
2837set (rapids-cmake-version "${RAPIDS_VERSION_MAJOR_MINOR} " )
38+ set (rapids-cmake-branch "${_rapids_branch} " )
2939include ("${CMAKE_CURRENT_LIST_DIR} /RAPIDS.cmake" )
You can’t perform that action at this time.
0 commit comments