From e990a1c8133ad25cc384ae80bc11960fe814990e Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Thu, 14 Dec 2023 11:58:20 -0800
Subject: [PATCH] Use CCCL.

---
 cpp/CMakeLists.txt                                 | 12 +++++-------
 .../{get_libcudacxx.cmake => get_cccl.cmake}       | 14 ++++++--------
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename cpp/cmake/thirdparty/{get_libcudacxx.cmake => get_cccl.cmake} (68%)

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index a772651625d..d8f359b5bcb 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -142,8 +142,8 @@ rapids_cpm_init()
 ###
 # Linking to the `raft::raft` target implicitly links cugraph targets to the
 # following public header-only  raft dependencies:
+# * CCCL
 # * RMM
-# * Thrust
 # * GTest/GMock
 #
 # The CMakeLists.txt for each of these projects are properly configured
@@ -153,16 +153,14 @@ rapids_cpm_init()
 # lags behind.
 ###
 
-# Need to make sure rmm is found before cuco so that rmm patches the libcudacxx
-# directory to be found by cuco.
+# Need CCCL, then rmm, then cuCollections, then RAFT.
+# This ensures that libraries can be overridden for testing.
+include(cmake/thirdparty/get_cccl.cmake)
 include(${rapids-cmake-dir}/cpm/rmm.cmake)
 rapids_cpm_rmm(BUILD_EXPORT_SET cugraph-exports
-               INSTALL_EXPORT_SET  cugraph-exports)
-# Putting this before raft to override RAFT from pulling them in.
-include(cmake/thirdparty/get_libcudacxx.cmake)
+               INSTALL_EXPORT_SET cugraph-exports)
 include(${rapids-cmake-dir}/cpm/cuco.cmake)
 rapids_cpm_cuco(BUILD_EXPORT_SET cugraph-exports INSTALL_EXPORT_SET cugraph-exports)
-
 include(cmake/thirdparty/get_raft.cmake)
 
 if(USE_CUGRAPH_OPS)
diff --git a/cpp/cmake/thirdparty/get_libcudacxx.cmake b/cpp/cmake/thirdparty/get_cccl.cmake
similarity index 68%
rename from cpp/cmake/thirdparty/get_libcudacxx.cmake
rename to cpp/cmake/thirdparty/get_cccl.cmake
index 1c51c5a84a9..72b53d4c833 100644
--- a/cpp/cmake/thirdparty/get_libcudacxx.cmake
+++ b/cpp/cmake/thirdparty/get_cccl.cmake
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2020-2022, NVIDIA CORPORATION.
+# Copyright (c) 2020-2023, 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
@@ -12,12 +12,10 @@
 # the License.
 # =============================================================================
 
-# This function finds libcudacxx and sets any additional necessary environment variables.
-function(find_and_configure_libcudacxx)
-  include(${rapids-cmake-dir}/cpm/libcudacxx.cmake)
-
-  rapids_cpm_libcudacxx(BUILD_EXPORT_SET cugraph-exports)
-
+# This function finds CCCL and sets any additional necessary environment variables.
+function(find_and_configure_cccl)
+  include(${rapids-cmake-dir}/cpm/cccl.cmake)
+  rapids_cpm_cccl(BUILD_EXPORT_SET cugraph-exports INSTALL_EXPORT_SET cugraph-exports)
 endfunction()
 
-find_and_configure_libcudacxx()
+find_and_configure_cccl()