cmake: install erasure plugins into ${pkglibdir}/erasure-code

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt
index d25465dc6fa38e75ce6c86d75ad394d111dc9072..580964420ed128cfd05d380872dc3d7144730750 100644 (file)
--- 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 923427441b7a743c08e4421bf6b3461c916c5780..1cb530424393e7b26f42c3da189ed53a12612899 100644 (file)
--- 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 92380b80be04b30d999619e71d11450ceeeff82d..b4cd0bb416e113ed2f316e675b04e8f09842360c 100644 (file)
--- 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 cd9e923337eecbfede553c0977648b5aec7b9d2f..06da24ce138cfc5c1ab6349e2ae26e14f0368d74 100644 (file)
--- 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 49d2954917d652a24e93858c2ac44993eddc10a0..a0124fd6df566eab57fc69c340dd1674931a4c67 100644 (file)
--- 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})