From 0d50906c14442c1b6de371ec8b0be242d4a96edb Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Wed, 9 Dec 2020 10:02:33 +0100 Subject: [PATCH] Import ZSTD --- .gitmodules | 3 +++ CMakeLists.txt | 8 ++++---- zstd | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) create mode 160000 zstd diff --git a/.gitmodules b/.gitmodules index 2556091d..4037d009 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "fbthrift"] path = fbthrift url = https://github.com/facebook/fbthrift/ +[submodule "zstd"] + path = zstd + url = https://github.com/facebook/zstd diff --git a/CMakeLists.txt b/CMakeLists.txt index 404426c5..eaa3905a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,6 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(FUSE3 REQUIRED IMPORTED_TARGET fuse3>=3.4.1) pkg_check_modules(LIBLZ4 IMPORTED_TARGET liblz4>=1.8.3) pkg_check_modules(LIBLZMA IMPORTED_TARGET liblzma>=5.2.4) -pkg_check_modules(LIBZSTD IMPORTED_TARGET libzstd>=1.3.8) find_path(SPARSEHASH_INCLUDE_DIR sparsehash/dense_hash_map REQUIRED) find_program(RONN_EXE ronn) @@ -77,6 +76,7 @@ set(compiler_only add_subdirectory(folly EXCLUDE_FROM_ALL) add_subdirectory(fbthrift EXCLUDE_FROM_ALL) +add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL) if(WITH_TESTS) # Download and unpack googletest at configure time @@ -290,9 +290,9 @@ foreach(tgt dwarfs ${BINARY_TARGETS}) target_compile_definitions( ${tgt} PRIVATE DWARFS_VERSION=\"${DWARFS_VERSION}\" + DWARFS_HAVE_LIBZSTD $<$:DWARFS_HAVE_LIBLZ4> $<$:DWARFS_HAVE_LIBLZMA> - $<$:DWARFS_HAVE_LIBZSTD> $<$:DWARFS_HAVE_PYTHON>) target_compile_options(${tgt} PRIVATE -Wall -Wextra -pedantic) @@ -315,9 +315,9 @@ foreach(tgt ${BINARY_TARGETS}) thrift_light folly ${Boost_LIBRARIES} + libzstd_static PkgConfig::LIBLZ4 - PkgConfig::LIBLZMA - PkgConfig::LIBZSTD) + PkgConfig::LIBLZMA) if(WITH_PYTHON) target_link_libraries(${tgt} ${BOOST_PYTHON_LIBS} ${Python3_LIBRARIES}) diff --git a/zstd b/zstd new file mode 160000 index 00000000..b706286a --- /dev/null +++ b/zstd @@ -0,0 +1 @@ +Subproject commit b706286adbba780006a47ef92df0ad7a785666b6