From 4f056017307898703433cc433fe1f8a04b466062 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 1 Jun 2016 11:14:49 +0800 Subject: [PATCH] cmake: install erasure plugins into ${pkglibdir}/erasure-code Signed-off-by: Kefu Chai --- src/erasure-code/CMakeLists.txt | 3 +++ src/erasure-code/isa/CMakeLists.txt | 2 +- src/erasure-code/jerasure/CMakeLists.txt | 10 +++++----- src/erasure-code/lrc/CMakeLists.txt | 2 +- src/erasure-code/shec/CMakeLists.txt | 10 +++++----- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt index d25465dc6fa38..580964420ed12 100644 --- a/src/erasure-code/CMakeLists.txt +++ b/src/erasure-code/CMakeLists.txt @@ -1,4 +1,7 @@ ## erasure code plugins + +set(erasure_plugin_dir ${CMAKE_INSTALL_PKGLIBDIR}/erasure-code) + #jerasure subdir must be before shec so jerasure & neon obj libs are declared include_directories(jerasure/jerasure/include) include_directories(jerasure/gf-complete/include) diff --git a/src/erasure-code/isa/CMakeLists.txt b/src/erasure-code/isa/CMakeLists.txt index 923427441b7a7..1cb530424393e 100644 --- a/src/erasure-code/isa/CMakeLists.txt +++ b/src/erasure-code/isa/CMakeLists.txt @@ -55,4 +55,4 @@ add_library(ec_isa SHARED ${isa_srcs}) add_dependencies(ec_isa ${CMAKE_SOURCE_DIR}/src/ceph_ver.h) target_link_libraries(ec_isa ${EXTRALIBS}) set_target_properties(ec_isa PROPERTIES VERSION 2.14.0 SOVERSION 2) -install(TARGETS ec_isa DESTINATION lib/erasure-code) +install(TARGETS ec_isa DESTINATION ${erasure_plugin_dir}) diff --git a/src/erasure-code/jerasure/CMakeLists.txt b/src/erasure-code/jerasure/CMakeLists.txt index 92380b80be04b..b4cd0bb416e11 100644 --- a/src/erasure-code/jerasure/CMakeLists.txt +++ b/src/erasure-code/jerasure/CMakeLists.txt @@ -33,7 +33,7 @@ add_library(ec_jerasure_generic SHARED add_dependencies(ec_jerasure_generic ${CMAKE_SOURCE_DIR}/src/ceph_ver.h) target_link_libraries(ec_jerasure_generic crush ${EXTRALIBS}) set_target_properties(ec_jerasure_generic PROPERTIES VERSION 2.0.0 SOVERSION 2) -install(TARGETS ec_jerasure_generic DESTINATION lib/erasure-code) +install(TARGETS ec_jerasure_generic DESTINATION ${erasure_plugin_dir}) # ec_jerasure_neon #TODO:build libec_jerasure_neon library on an ARM machine @@ -57,7 +57,7 @@ if(ARM_NEON OR ARM_NEON2) target_link_libraries(ec_jerasure_neon crush pthread ${EXTRALIBS}) set_target_properties(ec_jerasure_neon PROPERTIES VERSION 2.0.0 SOVERSION 2 COMPILE_FLAGS ${ARM_NEON_FLAGS}) - install(TARGETS ec_jerasure_neon DESTINATION lib/erasure-code) + install(TARGETS ec_jerasure_neon DESTINATION ${erasure_plugin_dir}) endif(ARM_NEON OR ARM_NEON2) # ec_jerasure_sse3 @@ -71,7 +71,7 @@ if(INTEL_SSE) target_link_libraries(ec_jerasure_sse3 crush ${EXTRALIBS}) set_target_properties(ec_jerasure_sse3 PROPERTIES VERSION 2.0.0 SOVERSION 2 COMPILE_FLAGS ${SSE3_FLAGS}) - install(TARGETS ec_jerasure_sse3 DESTINATION lib/erasure-code) + install(TARGETS ec_jerasure_sse3 DESTINATION ${erasure_plugin_dir}) endif(INTEL_SSE) # ec_jerasure_sse4 @@ -85,11 +85,11 @@ if(INTEL_SSE4_1) target_link_libraries(ec_jerasure_sse4 crush ${EXTRALIBS}) set_target_properties(ec_jerasure_sse4 PROPERTIES VERSION 2.0.0 SOVERSION 2 COMPILE_FLAGS ${SSE4_FLAGS}) - install(TARGETS ec_jerasure_sse4 DESTINATION lib/erasure-code) + install(TARGETS ec_jerasure_sse4 DESTINATION ${erasure_plugin_dir}) endif(INTEL_SSE4_1) add_library(ec_jerasure SHARED ErasureCodePluginSelectJerasure.cc) add_dependencies(ec_jerasure ${CMAKE_SOURCE_DIR}/src/ceph_ver.h) target_link_libraries(ec_jerasure ${EXTRALIBS}) set_target_properties(ec_jerasure PROPERTIES VERSION 2.0.0 SOVERSION 2) -install(TARGETS ec_jerasure DESTINATION lib/erasure-code) +install(TARGETS ec_jerasure DESTINATION ${erasure_plugin_dir}) diff --git a/src/erasure-code/lrc/CMakeLists.txt b/src/erasure-code/lrc/CMakeLists.txt index cd9e923337eec..06da24ce138cf 100644 --- a/src/erasure-code/lrc/CMakeLists.txt +++ b/src/erasure-code/lrc/CMakeLists.txt @@ -11,4 +11,4 @@ add_library(ec_lrc SHARED ${lrc_srcs}) add_dependencies(ec_lrc ${CMAKE_SOURCE_DIR}/src/ceph_ver.h) target_link_libraries(ec_lrc crush json_spirit) set_target_properties(ec_lrc PROPERTIES VERSION 1.0.0 SOVERSION 1) -install(TARGETS ec_lrc DESTINATION lib/erasure-code) +install(TARGETS ec_lrc DESTINATION ${erasure_plugin_dir}) diff --git a/src/erasure-code/shec/CMakeLists.txt b/src/erasure-code/shec/CMakeLists.txt index 49d2954917d65..a0124fd6df566 100644 --- a/src/erasure-code/shec/CMakeLists.txt +++ b/src/erasure-code/shec/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(ec_shec_generic SHARED target_link_libraries(ec_shec_generic crush pthread) add_dependencies(ec_shec_generic ${CMAKE_SOURCE_DIR}/src/ceph_ver.h) set_target_properties(ec_shec_generic PROPERTIES VERSION 1.0.0 SOVERSION 1) -install(TARGETS ec_shec_generic DESTINATION lib/erasure-code) +install(TARGETS ec_shec_generic DESTINATION ${erasure_plugin_dir}) # ec_shec_neon #TODO:build libec_shec_neon library on an ARM machine @@ -33,7 +33,7 @@ if(ARM_NEON OR ARM_NEON2) target_link_libraries(ec_shec_neon ${EXTRALIBS}) set_target_properties(ec_shec_neon PROPERTIES VERSION 2.0.0 SOVERSION 2 COMPILE_FLAGS ${ARM_NEON_FLAGS}) - install(TARGETS ec_shec_neon DESTINATION lib/erasure-code) + install(TARGETS ec_shec_neon DESTINATION ${erasure_plugin_dir}) endif(ARM_NEON OR ARM_NEON2) # ec_shec_sse3 @@ -45,7 +45,7 @@ if(INTEL_SSE) target_link_libraries(ec_shec_sse3 crush ${EXTRALIBS}) set_target_properties(ec_shec_sse3 PROPERTIES VERSION 2.0.0 SOVERSION 2 COMPILE_FLAGS ${SSE3_FLAGS}) - install(TARGETS ec_shec_sse3 DESTINATION lib/erasure-code) + install(TARGETS ec_shec_sse3 DESTINATION ${erasure_plugin_dir}) endif(INTEL_SSE) # ec_shec_sse4 @@ -57,11 +57,11 @@ if(INTEL_SSE4_1) target_link_libraries(ec_shec_sse4 crush ${EXTRALIBS}) set_target_properties(ec_shec_sse4 PROPERTIES VERSION 2.0.0 SOVERSION 2 COMPILE_FLAGS ${SSE4_FLAGS}) - install(TARGETS ec_shec_sse4 DESTINATION lib/erasure-code) + install(TARGETS ec_shec_sse4 DESTINATION ${erasure_plugin_dir}) endif(INTEL_SSE4_1) add_library(ec_shec SHARED ErasureCodePluginSelectShec.cc) add_dependencies(ec_shec ${CMAKE_SOURCE_DIR}/src/ceph_ver.h) target_link_libraries(ec_shec ${EXTRALIBS}) set_target_properties(ec_shec PROPERTIES VERSION 2.0.0 SOVERSION 2) -install(TARGETS ec_shec DESTINATION lib/erasure-code) +install(TARGETS ec_shec DESTINATION ${erasure_plugin_dir}) -- 2.39.5