]>
Commit | Line | Data |
---|---|---|
f8bb146f JR |
1 | diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt |
2 | index b53b0d9444..5bf5796da2 100644 | |
3 | --- a/src/compressor/zstd/CMakeLists.txt | |
4 | +++ b/src/compressor/zstd/CMakeLists.txt | |
5 | @@ -1,34 +1,11 @@ | |
6 | # zstd | |
7 | ||
8 | -# libzstd - build it statically | |
9 | -set(ZSTD_C_FLAGS "-fPIC -Wno-unused-variable -O3") | |
10 | - | |
11 | -include(ExternalProject) | |
12 | -ExternalProject_Add(zstd_ext | |
13 | - SOURCE_DIR ${CMAKE_SOURCE_DIR}/src/zstd/build/cmake | |
14 | - CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} | |
15 | - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} | |
16 | - -DCMAKE_C_FLAGS=${ZSTD_C_FLAGS} | |
17 | - -DCMAKE_AR=${CMAKE_AR} | |
18 | - -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_SHARED} | |
19 | - -G${CMAKE_GENERATOR} | |
20 | - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libzstd | |
21 | - BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target libzstd_static | |
22 | - BUILD_BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a" | |
23 | - INSTALL_COMMAND "true") | |
24 | - | |
25 | -add_library(zstd STATIC IMPORTED) | |
26 | -set_target_properties(zstd PROPERTIES | |
27 | - INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/zstd/lib" | |
28 | - IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a") | |
29 | -add_dependencies(zstd zstd_ext) | |
30 | - | |
31 | set(zstd_sources | |
32 | CompressionPluginZstd.cc | |
33 | ) | |
34 | ||
35 | add_library(ceph_zstd SHARED ${zstd_sources}) | |
36 | -target_link_libraries(ceph_zstd PRIVATE zstd $<$<PLATFORM_ID:Windows>:ceph-common>) | |
37 | +target_link_libraries(ceph_zstd zstd) | |
38 | set_target_properties(ceph_zstd PROPERTIES | |
39 | VERSION 2.0.0 | |
40 | SOVERSION 2 |