Skip to content

Commit

Permalink
Ensure libcudf searches for our patched version of CCCL first (#14655)
Browse files Browse the repository at this point in the history
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: #14655
  • Loading branch information
robertmaynard authored Dec 19, 2023
1 parent cf13b86 commit 57fb798
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions cpp/cmake/thirdparty/get_cccl.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@ 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(
INSTALL CCCL [=[${CMAKE_CURRENT_LIST_DIR}/../../../include/libcudf/lib/rapids/cmake/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()

0 comments on commit 57fb798

Please sign in to comment.