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

chore: Fall back on shared libzstd if libzstd_static is not available #704

Merged
merged 6 commits into from
Jan 9, 2025
+8 −1
Merged

chore: Fall back on shared libzstd if libzstd_static is not available #704

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2dff488
test with other branch
paleolimbot Jan 8, 2025
9fa78fc
maybe install system zstd
paleolimbot Jan 8, 2025
f4797cc
try conda install
paleolimbot Jan 9, 2025
3b8c477
maybe the right conda pkg
paleolimbot Jan 9, 2025
c4d82a2
handle missing libzstd_static
paleolimbot Jan 9, 2025
f5a1190
undo image changes
paleolimbot Jan 9, 2025
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
9 changes: 8 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,14 @@ if(NANOARROW_IPC)
if(NANOARROW_IPC_WITH_ZSTD)
find_package(zstd REQUIRED)
set(NANOARROW_IPC_EXTRA_FLAGS "-DNANOARROW_IPC_WITH_ZSTD")
set(NANOARROW_IPC_EXTRA_LIBS zstd::libzstd_static)

# libzstd_static is not available from conda
# This could be configurable if shared zstd is a must
if(TARGET zstd::libzstd_static)
set(NANOARROW_IPC_EXTRA_LIBS zstd::libzstd_static)
else()
set(NANOARROW_IPC_EXTRA_LIBS zstd::libzstd)
endif()
endif()

if(NOT NANOARROW_BUNDLE)
Expand Down
Loading