Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove zlib from libcudf public CMake dependencies #9204

Merged
merged 4 commits into from
Sep 17, 2021
Merged

Remove zlib from libcudf public CMake dependencies #9204

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7da6c3a
Remove zlib from public CMake dependencies
robertmaynard Sep 9, 2021
56c58ce
Merge branch 'branch-21.10' into bug/remove_zlib_from_public_deps
robertmaynard Sep 13, 2021
5242d8f
Merge branch 'branch-21.10' into bug/remove_zlib_from_public_deps
kkraus14 Sep 17, 2021
bb77991
fix spacing issue
kkraus14 Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,8 @@ include(cmake/Modules/ConfigureCUDA.cmake) # set other CUDA compilation flags
# - dependencies ----------------------------------------------------------------------------------

# find zlib
rapids_find_package(ZLIB REQUIRED
BUILD_EXPORT_SET cudf-exports
INSTALL_EXPORT_SET cudf-exports)
rapids_find_package(ZLIB REQUIRED)

# find Threads (needed by cudftestutil)
rapids_find_package(Threads REQUIRED
BUILD_EXPORT_SET cudf-exports
Expand Down Expand Up @@ -505,11 +504,11 @@ add_dependencies(cudf jitify_preprocess_run)

# Specify the target module library dependencies
target_link_libraries(cudf
PUBLIC ZLIB::ZLIB
${ARROW_LIBRARIES}
PUBLIC ${ARROW_LIBRARIES}
cudf::Thrust
rmm::rmm
PRIVATE cuco::cuco)
PRIVATE cuco::cuco
ZLIB::ZLIB)

# Add Conda library, and include paths if specified
if(TARGET conda_env)
Expand Down