rapids_config will use RAPIDS_BRANCH contents to determine what branch to use

Author: robertmaynard

RAPIDS_BRANCH

@@ -1 +1 @@
-25.10
+branch-25.10

cmake/RAPIDS.cmake

@@ -18,9 +18,7 @@
 cmake_minimum_required(VERSION 3.30.4 FATAL_ERROR)
 
 # Allow users to control which version is used
-if(NOT rapids-cmake-version OR NOT rapids-cmake-version MATCHES [[^([0-9][0-9])\.([0-9][0-9])$]])
- Use STRINGS to trim whitespace/newlines
-file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../RAPIDS_BRANCH" _rapids_branch)
+if(NOT rapids-cmake-branch OR NOT rapids-cmake-version)
   message(
     FATAL_ERROR "The CMake variable `rapids-cmake-branch` or `rapids-cmake-version` must be defined"
   )
@@ -74,8 +72,7 @@ if(rapids-cmake-fetch-via-git)
   FetchContent_Declare(
     rapids-cmake
     GIT_REPOSITORY "${rapids-cmake-url}"
-    GIT_TAG "${rapids-cmake-value-to-clone}"
-  )
+    GIT_TAG "${rapids-cmake-value-to-clone}")
 else()
   string(APPEND rapids-cmake-url "${rapids-cmake-value-to-clone}")
   FetchContent_Declare(rapids-cmake URL "${rapids-cmake-url}")

cmake/rapids_config.cmake

@@ -12,8 +12,6 @@
 # the License.
 # =============================================================================
 file(READ "${CMAKE_CURRENT_LIST_DIR}/../VERSION" _rapids_version)
-# Use STRINGS to trim whitespace/newlines
-file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../RAPIDS_BRANCH" _rapids_branch)
 if(_rapids_version MATCHES [[^([0-9][0-9])\.([0-9][0-9])\.([0-9][0-9])]])
   set(RAPIDS_VERSION_MAJOR "${CMAKE_MATCH_1}")
   set(RAPIDS_VERSION_MINOR "${CMAKE_MATCH_2}")
@@ -24,13 +22,18 @@ else()
   string(REPLACE "\n" "\n  " _rapids_version_formatted "  ${_rapids_version}")
   message(
     FATAL_ERROR
-      "Could not determine RAPIDS version. Contents of VERSION file:\n${_rapids_version_formatted}"
-  )
+      "Could not determine RAPIDS version. Contents of VERSION file:\n${_rapids_version_formatted}")
 endif()
 
-set(rapids-cmake-version "${RAPIDS_VERSION_MAJOR_MINOR}")
+# Use STRINGS to trim whitespace/newlines
+file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../RAPIDS_BRANCH" _rapids_branch)
 if(NOT _rapids_branch)
-  message(FATAL_ERROR "Could not determine branch name to use for checking out rapids-cmake. The file "${CMAKE_CURRENT_LIST_DIR}/../RAPIDS_BRANCH" is missing.")
+  message(
+    FATAL_ERROR
+      "Could not determine branch name to use for checking out rapids-cmake. The file \"${CMAKE_CURRENT_LIST_DIR}/../RAPIDS_BRANCH\" is missing."
+  )
 endif()
+
+set(rapids-cmake-version "${RAPIDS_VERSION_MAJOR_MINOR}")
 set(rapids-cmake-branch "${_rapids_branch}")
 include("${CMAKE_CURRENT_LIST_DIR}/RAPIDS.cmake")