TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-12 22:10:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Import ZSTD

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2020-12-09 10:02:33 +01:00
parent 04c43ec421
commit 0d50906c14
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "fbthrift"] [submodule "fbthrift"]
path = fbthrift path = fbthrift
url = https://github.com/facebook/fbthrift/ url = https://github.com/facebook/fbthrift/
[submodule "zstd"]
path = zstd
url = https://github.com/facebook/zstd

8
CMakeLists.txt
View File

@ -66,7 +66,6 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(FUSE3 REQUIRED IMPORTED_TARGET fuse3>=3.4.1) pkg_check_modules(FUSE3 REQUIRED IMPORTED_TARGET fuse3>=3.4.1)
pkg_check_modules(LIBLZ4 IMPORTED_TARGET liblz4>=1.8.3) pkg_check_modules(LIBLZ4 IMPORTED_TARGET liblz4>=1.8.3)
pkg_check_modules(LIBLZMA IMPORTED_TARGET liblzma>=5.2.4) 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_path(SPARSEHASH_INCLUDE_DIR sparsehash/dense_hash_map REQUIRED)
find_program(RONN_EXE ronn) find_program(RONN_EXE ronn)
@ -77,6 +76,7 @@ set(compiler_only
add_subdirectory(folly EXCLUDE_FROM_ALL) add_subdirectory(folly EXCLUDE_FROM_ALL)
add_subdirectory(fbthrift EXCLUDE_FROM_ALL) add_subdirectory(fbthrift EXCLUDE_FROM_ALL)
add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)
if(WITH_TESTS) if(WITH_TESTS)
# Download and unpack googletest at configure time # Download and unpack googletest at configure time
@ -290,9 +290,9 @@ foreach(tgt dwarfs ${BINARY_TARGETS})
target_compile_definitions( target_compile_definitions(
${tgt} ${tgt}
PRIVATE DWARFS_VERSION=\"${DWARFS_VERSION}\" PRIVATE DWARFS_VERSION=\"${DWARFS_VERSION}\"
DWARFS_HAVE_LIBZSTD
$<$<BOOL:${LIBLZ4_FOUND}>:DWARFS_HAVE_LIBLZ4> $<$<BOOL:${LIBLZ4_FOUND}>:DWARFS_HAVE_LIBLZ4>
$<$<BOOL:${LIBLZMA_FOUND}>:DWARFS_HAVE_LIBLZMA> $<$<BOOL:${LIBLZMA_FOUND}>:DWARFS_HAVE_LIBLZMA>
$<$<BOOL:${LIBZSTD_FOUND}>:DWARFS_HAVE_LIBZSTD>
$<$<BOOL:${WITH_PYTHON}>:DWARFS_HAVE_PYTHON>) $<$<BOOL:${WITH_PYTHON}>:DWARFS_HAVE_PYTHON>)
target_compile_options(${tgt} PRIVATE -Wall -Wextra -pedantic) target_compile_options(${tgt} PRIVATE -Wall -Wextra -pedantic)
@ -315,9 +315,9 @@ foreach(tgt ${BINARY_TARGETS})
thrift_light thrift_light
folly folly
${Boost_LIBRARIES} ${Boost_LIBRARIES}
libzstd_static
PkgConfig::LIBLZ4 PkgConfig::LIBLZ4
PkgConfig::LIBLZMA PkgConfig::LIBLZMA)
PkgConfig::LIBZSTD)
if(WITH_PYTHON) if(WITH_PYTHON)
target_link_libraries(${tgt} ${BOOST_PYTHON_LIBS} ${Python3_LIBRARIES}) target_link_libraries(${tgt} ${BOOST_PYTHON_LIBS} ${Python3_LIBRARIES})

1
zstd Submodule

@ -0,0 +1 @@
Subproject commit b706286adbba780006a47ef92df0ad7a785666b6