From: Kefu Chai Date: Wed, 1 Jun 2016 03:25:11 +0000 (+0800) Subject: cmake: install compressor plugins into ${pkglibdir/compressor X-Git-Tag: v11.0.0~358^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfea8e41bd4d0f4f9bb1421c7e2458dc1de82d7e;p=ceph.git cmake: install compressor plugins into ${pkglibdir/compressor Signed-off-by: Kefu Chai --- diff --git a/src/compressor/CMakeLists.txt b/src/compressor/CMakeLists.txt index 3ebc47bee817..36b0a90ceb4b 100644 --- a/src/compressor/CMakeLists.txt +++ b/src/compressor/CMakeLists.txt @@ -6,7 +6,7 @@ add_library(compressor_objs OBJECT ${compressor_srcs}) ## compressor plugins -set(compressorlibdir ${LIBRARY_OUTPUT_PATH}/compressor) +set(compressor_plugin_dir ${CMAKE_INSTALL_PKGLIBDIR}/compressor) add_subdirectory(snappy) add_subdirectory(zlib) diff --git a/src/compressor/snappy/CMakeLists.txt b/src/compressor/snappy/CMakeLists.txt index eb7473065dab..bd3ec59c7d18 100644 --- a/src/compressor/snappy/CMakeLists.txt +++ b/src/compressor/snappy/CMakeLists.txt @@ -8,4 +8,4 @@ add_library(ceph_snappy SHARED ${snappy_sources}) add_dependencies(ceph_snappy ${CMAKE_SOURCE_DIR}/src/ceph_ver.h) target_link_libraries(ceph_snappy snappy) set_target_properties(ceph_snappy PROPERTIES VERSION 2.0.0 SOVERSION 2) -install(TARGETS ceph_snappy DESTINATION lib/compressor) +install(TARGETS ceph_snappy DESTINATION ${compressor_plugin_dir}) diff --git a/src/compressor/zlib/CMakeLists.txt b/src/compressor/zlib/CMakeLists.txt index b68f4c9875b4..77766dc9fa0e 100644 --- a/src/compressor/zlib/CMakeLists.txt +++ b/src/compressor/zlib/CMakeLists.txt @@ -9,4 +9,4 @@ add_library(ceph_zlib SHARED ${zlib_sources}) add_dependencies(ceph_zlib ${CMAKE_SOURCE_DIR}/src/ceph_ver.h) target_link_libraries(ceph_zlib z) set_target_properties(ceph_zlib PROPERTIES VERSION 2.0.0 SOVERSION 2) -install(TARGETS ceph_zlib DESTINATION lib/compressor) +install(TARGETS ceph_zlib DESTINATION ${compressor_plugin_dir})