Use LIBCUDACXX_VERSION as CCCL_VERSION doesn't always exist

rapidsai · Jan 13, 2025 · 62202ed · 62202ed
1 parent 2043de5
commit 62202ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/rapids-cmake/cpm/cccl.cmake b/rapids-cmake/cpm/cccl.cmake
@@ -102,8 +102,8 @@ function(rapids_cpm_cccl)
 
     set_property(GLOBAL PROPERTY rapids_cmake_cccl_install_rules ON)
     # CCCL < 2.8 does not currently correctly support installation of cub/thrust/libcudacxx in a
-    # subdirectory
-    if(CCCL_VERSION VERSION_LESS 2.8)
+    # subdirectory CCCL_VERSION doesn't exist when using `add_subdirectory`
+    if(LIBCUDACXX_VERSION VERSION_LESS 2.8)
       set(Thrust_SOURCE_DIR "${CCCL_SOURCE_DIR}/thrust")
       set(CUB_SOURCE_DIR "${CCCL_SOURCE_DIR}/cub")
       set(libcudacxx_SOURCE_DIR "${CCCL_SOURCE_DIR}/libcudacxx")

diff --git a/testing/cpm/CMakeLists.txt b/testing/cpm/CMakeLists.txt
@@ -82,9 +82,9 @@ add_cmake_build_test( cpm_bs_thread_pool-install-config-works.cmake )
 
 add_cmake_config_test( cpm_cccl-simple.cmake )
 add_cmake_config_test( cpm_cccl-export.cmake )
-add_cmake_build_test( cpm_cccl-version-2-5.cmake )
-add_cmake_build_test( cpm_cccl-version-2-7.cmake )
-add_cmake_build_test( cpm_cccl-version-2-8.cmake )
+add_cmake_build_test( cpm_cccl-version-2-5.cmake NO_CPM_CACHE )
+add_cmake_build_test( cpm_cccl-version-2-7.cmake NO_CPM_CACHE )
+add_cmake_build_test( cpm_cccl-version-2-8.cmake NO_CPM_CACHE )
 add_cmake_build_test( cpm_cccl-preserve-custom-install-loc )
 
 add_cmake_config_test( cpm_cuco-simple.cmake )