Update CMake

rapidsai · Jan 3, 2025 · 638dc53 · 638dc53
1 parent c3e5219
commit 638dc53
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -163,11 +163,8 @@ include(cmake/modules/ConfigureCUDA.cmake)
 # add third party dependencies using CPM
 rapids_cpm_init()
 
-# Not using rapids-cmake since we never want to find, always download.
-CPMAddPackage(
-  NAME rapids_logger GITHUB_REPOSITORY rapidsai/rapids-logger GIT_SHALLOW FALSE GIT_TAG
-  4df3ee70c6746fd1b6c0dc14209dae2e2d4378c6 VERSION 4df3ee70c6746fd1b6c0dc14209dae2e2d4378c6
-)
+include(${rapids-cmake-dir}/cpm/logger.cmake)
+rapids_cpm_logger()
 rapids_make_logger(raft LOGGER_HEADER_DIR include/raft/core EXPORT_SET raft-exports)
 
 # CCCL before rmm/cuco so we get the right version of CCCL

diff --git a/cpp/cmake/thirdparty/get_rmm.cmake b/cpp/cmake/thirdparty/get_rmm.cmake
@@ -15,9 +15,21 @@
 #=============================================================================
 
 function(find_and_configure_rmm)
-    include(${rapids-cmake-dir}/cpm/rmm.cmake)
-    rapids_cpm_rmm(BUILD_EXPORT_SET raft-exports
-                   INSTALL_EXPORT_SET raft-exports)
+    #include(${rapids-cmake-dir}/cpm/rmm.cmake)
+    #rapids_cpm_rmm(BUILD_EXPORT_SET raft-exports
+                   #INSTALL_EXPORT_SET raft-exports)
+  include("${rapids-cmake-dir}/cpm/find.cmake")
+  rapids_cpm_find(
+    rmm 25.02
+    BUILD_EXPORT_SET raft-exports
+    INSTALL_EXPORT_SET raft-exports
+    GLOBAL_TARGETS rmm::rmm
+    CPM_ARGS
+    GIT_REPOSITORY "https://github.com/vyasr/rmm.git"
+    GIT_TAG "chore/rapids_cmake_logger"
+    OPTIONS "BUILD_TESTS OFF" "BUILD_BENCHMARKS OFF"
+  )
+
 endfunction()
 
 find_and_configure_rmm()