From 6f6d9cc538a2c98473475a419c6ce5f48c07b277 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Tue, 22 Mar 2022 11:57:21 -0400 Subject: [PATCH 1/2] Adding INSTALL_EXPORT_SET for cuco, rmm, thrust --- cpp/cmake/thirdparty/get_cuco.cmake | 1 + cpp/cmake/thirdparty/get_rmm.cmake | 3 ++- cpp/cmake/thirdparty/get_thrust.cmake | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cpp/cmake/thirdparty/get_cuco.cmake b/cpp/cmake/thirdparty/get_cuco.cmake index 3a70d34283..dc0bf6a029 100644 --- a/cpp/cmake/thirdparty/get_cuco.cmake +++ b/cpp/cmake/thirdparty/get_cuco.cmake @@ -20,6 +20,7 @@ function(find_and_configure_cuco VERSION) rapids_cpm_find(cuco ${VERSION} GLOBAL_TARGETS cuco::cuco BUILD_EXPORT_SET raft-exports + INSTALL_EXPORT_SET raft-exports CPM_ARGS EXCLUDE_FROM_ALL TRUE GIT_REPOSITORY https://github.com/NVIDIA/cuCollections.git diff --git a/cpp/cmake/thirdparty/get_rmm.cmake b/cpp/cmake/thirdparty/get_rmm.cmake index ffab703091..5a7d54ea4a 100644 --- a/cpp/cmake/thirdparty/get_rmm.cmake +++ b/cpp/cmake/thirdparty/get_rmm.cmake @@ -16,7 +16,8 @@ function(find_and_configure_rmm) include(${rapids-cmake-dir}/cpm/rmm.cmake) - rapids_cpm_rmm(BUILD_EXPORT_SET raft-exports) + rapids_cpm_rmm(BUILD_EXPORT_SET raft-exports + INSTALL_EXPORT_SET raft-exports) endfunction() find_and_configure_rmm() diff --git a/cpp/cmake/thirdparty/get_thrust.cmake b/cpp/cmake/thirdparty/get_thrust.cmake index a0ea09483b..b142f1ac0d 100644 --- a/cpp/cmake/thirdparty/get_thrust.cmake +++ b/cpp/cmake/thirdparty/get_thrust.cmake @@ -18,6 +18,7 @@ function(find_and_configure_thrust) rapids_cpm_thrust( NAMESPACE raft ) rapids_export_package(BUILD Thrust raft-exports) + rapids_export_package(INSTALL Thrust raft-exports) endfunction() find_and_configure_thrust() From 2ff3536767fc36861d473db655750b7eb6449157 Mon Sep 17 00:00:00 2001 From: "Corey J. Nolet" Date: Tue, 22 Mar 2022 13:02:08 -0400 Subject: [PATCH 2/2] Calling single thrust function instead of two --- cpp/cmake/thirdparty/get_thrust.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp/cmake/thirdparty/get_thrust.cmake b/cpp/cmake/thirdparty/get_thrust.cmake index b142f1ac0d..03dfecde6a 100644 --- a/cpp/cmake/thirdparty/get_thrust.cmake +++ b/cpp/cmake/thirdparty/get_thrust.cmake @@ -16,9 +16,9 @@ function(find_and_configure_thrust) include(${rapids-cmake-dir}/cpm/thrust.cmake) - rapids_cpm_thrust( NAMESPACE raft ) - rapids_export_package(BUILD Thrust raft-exports) - rapids_export_package(INSTALL Thrust raft-exports) + rapids_cpm_thrust( NAMESPACE raft + BUILD_EXPORT_SET raft-exports + INSTALL_EXPORT_SET raft-exports) endfunction() find_and_configure_thrust()