From 57fb79884b241c31b75ec729dcf2f883253c2406 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 19 Dec 2023 18:04:35 -0500 Subject: [PATCH] Ensure libcudf searches for our patched version of CCCL first (#14655) Previously we searched for the rapids-cmake version of CCCL first which isn't desired as it doesn't have the patches CUDF ( and consumers ) require. Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cudf/pull/14655 --- cpp/cmake/thirdparty/get_cccl.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cpp/cmake/thirdparty/get_cccl.cmake b/cpp/cmake/thirdparty/get_cccl.cmake index 799bdd7f178..c369b720684 100644 --- a/cpp/cmake/thirdparty/get_cccl.cmake +++ b/cpp/cmake/thirdparty/get_cccl.cmake @@ -26,9 +26,6 @@ function(find_and_configure_cccl) set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/libcudf") set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_INCLUDEDIR}/lib") - # Find or install CCCL with our custom set of patches - rapids_cpm_cccl(BUILD_EXPORT_SET cudf-exports INSTALL_EXPORT_SET cudf-exports) - # Store where CMake can find our custom CCCL install include("${rapids-cmake-dir}/export/find_package_root.cmake") rapids_export_find_package_root( @@ -36,6 +33,10 @@ function(find_and_configure_cccl) EXPORT_SET cudf-exports CONDITION CCCL_SOURCE_DIR ) + + # Find or install CCCL with our custom set of patches + rapids_cpm_cccl(BUILD_EXPORT_SET cudf-exports INSTALL_EXPORT_SET cudf-exports) + endfunction() find_and_configure_cccl()