From 41f9b1522e49e2092e539ff390310308c019924f Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Thu, 11 Sep 2025 13:53:44 +0200 Subject: [PATCH] Pass ZSTD to ifopsh build --- cmake/CMakeLists.txt | 3 +++ nix/build-all.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 2af40aebaf..9c3144c026 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -349,6 +349,9 @@ if (WITH_ROCKSDB) set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB) if (WITH_ZSTD) + # @todo do we actually need the zstd include dir or rather just pass + # the libzstd.a along with the rocksdb library when needed and feature + # detect based on rocksdb API? if("${ZSTD_INCLUDE_DIR}" STREQUAL "") find_path(ZSTD_INCLUDE_DIR zstd.h PATHS diff --git a/nix/build-all.py b/nix/build-all.py index fa70c694f5..0379187e35 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -1139,6 +1139,9 @@ if "rocksdb" in targets: f"-DWITH_ROCKSDB=On", f"-DROCKSDB_INCLUDE_DIR={DEPS_DIR}/install/rocksdb-{ROCKSDB_VERSION}/include", f"-DROCKSDB_LIBRARY_DIR={DEPS_DIR}/install/rocksdb-{ROCKSDB_VERSION}/lib", + f"-DWITH_ZSTD=On", + f"-DZSTD_INCLUDE_DIR={DEPS_DIR}/install/zstd-{ZSTD_VERSION}/include", + f"-DZSTD_LIBRARY_DIR={DEPS_DIR}/install/zstd-{ZSTD_VERSION}/lib", ] )