RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 02:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23852 from tchaikov/wip-cmake-cleanup

Browse Source 
cmake: link compressor plugins against lib the modern way

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Kefu Chai 2018-09-05 22:28:37 +08:00 committed by GitHub
commit e29eb03521
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/compressor/brotli/CMakeLists.txt
View File

@ -26,12 +26,13 @@ set(bortli_libs enc dec common)
foreach(lib ${bortli_libs})
add_library(brotli::${lib} STATIC IMPORTED)
add_dependencies(brotli::${lib} brotli_ext)
set_property(TARGET brotli::${lib} PROPERTY IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/src/brotli/libbrotli${lib}-static.a")
set_target_properties(brotli::${lib} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/src/brotli/c/include"
IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/src/brotli/libbrotli${lib}-static.a")
list(APPEND BROTLI_LIBRARIES brotli::${lib})
endforeach()
add_library(ceph_brotli SHARED ${brotli_sources})
target_include_directories(ceph_brotli PRIVATE "${CMAKE_BINARY_DIR}/src/brotli/c/include")
List(REVERSE bortli_libs)
target_link_libraries(ceph_brotli ${BROTLI_LIBRARIES})
list(REVERSE bortli_libs)
target_link_libraries(ceph_brotli PRIVATE ${BROTLI_LIBRARIES})
install(TARGETS ceph_brotli DESTINATION ${compressor_plugin_dir})

2
src/compressor/lz4/CMakeLists.txt
View File

@ -5,7 +5,7 @@ set(lz4_sources
)
add_library(ceph_lz4 SHARED ${lz4_sources})
target_link_libraries(ceph_lz4 ${LZ4_LIBRARY})
target_link_libraries(ceph_lz4 PRIVATE LZ4::LZ4)
set_target_properties(ceph_lz4 PROPERTIES
VERSION 2.0.0
SOVERSION 2

4
src/compressor/snappy/CMakeLists.txt
View File

@ -5,9 +5,7 @@ set(snappy_sources
)
add_library(ceph_snappy SHARED ${snappy_sources})
target_include_directories(ceph_snappy SYSTEM PRIVATE
"${SNAPPY_INCLUDE_DIR}")
target_link_libraries(ceph_snappy snappy::snappy)
target_link_libraries(ceph_snappy PRIVATE snappy::snappy)
set_target_properties(ceph_snappy PROPERTIES
VERSION 2.0.0
SOVERSION 2

2
src/compressor/zlib/CMakeLists.txt
View File

@ -38,7 +38,7 @@ else(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
endif(HAVE_INTEL_SSE4_1 AND HAVE_BETTER_YASM_ELF64 AND (NOT APPLE))
add_library(ceph_zlib SHARED ${zlib_sources})
target_link_libraries(ceph_zlib ${ZLIB_LIBRARIES})
target_link_libraries(ceph_zlib ZLIB::ZLIB)
target_include_directories(ceph_zlib SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/isa-l/include")
set_target_properties(ceph_zlib PROPERTIES
VERSION 2.0.0

7
src/compressor/zstd/CMakeLists.txt
View File

@ -22,18 +22,17 @@ ExternalProject_Add_Step(zstd_ext forcebuild
ALWAYS 1)
add_library(zstd STATIC IMPORTED)
set_property(TARGET zstd PROPERTY
set_target_properties(zstd PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/zstd/lib"
IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/libzstd/lib/libzstd.a")
add_dependencies(zstd zstd_ext)
set(ZSTD_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/zstd/lib)
#
set(zstd_sources
CompressionPluginZstd.cc
)
add_library(ceph_zstd SHARED ${zstd_sources})
target_link_libraries(ceph_zstd zstd)
target_link_libraries(ceph_zstd PRIVATE zstd)
set_target_properties(ceph_zstd PROPERTIES
VERSION 2.0.0
SOVERSION 2