cmake: rename CMAKE_INSTALL_{FULL_}?PKGLIBDIR

rename CMAKE_INSTALL_{FULL_}?PKGLIBDIR to
CEPH_INSTALL_{FULL_}?PKGLIBDIR. in order to differentiate them from the
paths not ended with "ceph".

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3031524230d44917989e52acfd7f0ab91154e85f..25df4fe882f91913ddd770f4dc87b9e5ec479213 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,14 +2,14 @@ include(GetGitRevisionDescription)
 
 include(GNUInstallDirs)
 # for erasure and compressor plugins
-set(CMAKE_INSTALL_PKGLIBDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
-set(CMAKE_INSTALL_FULL_PKGLIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})
+set(CEPH_INSTALL_PKGLIBDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+set(CEPH_INSTALL_FULL_PKGLIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})
 # for mgr plugins
 set(CEPH_INSTALL_DATADIR ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME})
 # so libceph-common can be found
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 if(NOT CMAKE_INSTALL_RPATH)
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_PKGLIBDIR}")
+  set(CMAKE_INSTALL_RPATH "${CEPH_INSTALL_FULL_PKGLIBDIR}")
 endif()
 
 # to be compatible with configure_files shared with autoconfig
@@ -416,7 +416,7 @@ endif()
 install(
   TARGETS ceph-common
   LIBRARY
-  DESTINATION ${CMAKE_INSTALL_PKGLIBDIR}
+  DESTINATION ${CEPH_INSTALL_PKGLIBDIR}
   NAMELINK_SKIP)
 
 if(${WITH_LTTNG})

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 4ebff8718330a80afc0ea24908a6b29272d32d51..65ba10b0f145fca64149577b00f60d31d73feb49 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -127,7 +127,7 @@ add_library(common-common-objs OBJECT
 # for options.cc
 target_compile_definitions(common-common-objs PRIVATE
   "CEPH_LIBDIR=\"${CMAKE_INSTALL_FULL_LIBDIR}\""
-  "CEPH_PKGLIBDIR=\"${CMAKE_INSTALL_FULL_PKGLIBDIR}\""
+  "CEPH_PKGLIBDIR=\"${CEPH_INSTALL_FULL_PKGLIBDIR}\""
   "CEPH_DATADIR=\"${CEPH_INSTALL_DATADIR}\"")
 
 set(common_mountcephfs_srcs

diff --git a/src/compressor/CMakeLists.txt b/src/compressor/CMakeLists.txt
index 5182784288e92c56621b94269f8391f2affd5633..494bcc44749c2504f1ea344ac657da3ee1921e76 100644 (file)
--- a/src/compressor/CMakeLists.txt
+++ b/src/compressor/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(compressor_objs OBJECT ${compressor_srcs})
 
 ## compressor plugins
 
-set(compressor_plugin_dir ${CMAKE_INSTALL_PKGLIBDIR}/compressor)
+set(compressor_plugin_dir ${CEPH_INSTALL_PKGLIBDIR}/compressor)
 
 add_subdirectory(snappy)
 add_subdirectory(zlib)

diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
index 360b986855d2246dc73fa0b61642cde8f48e90f6..d656f59451af54c750908bda27c8b489a8079f6f 100644 (file)
--- a/src/crimson/CMakeLists.txt
+++ b/src/crimson/CMakeLists.txt
@@ -96,7 +96,7 @@ add_library(crimson-common STATIC
 
 target_compile_definitions(crimson-common PRIVATE
   "CEPH_LIBDIR=\"${CMAKE_INSTALL_FULL_LIBDIR}\""
-  "CEPH_PKGLIBDIR=\"${CMAKE_INSTALL_FULL_PKGLIBDIR}\""
+  "CEPH_PKGLIBDIR=\"${CEPH_INSTALL_FULL_PKGLIBDIR}\""
   "CEPH_DATADIR=\"${CEPH_INSTALL_DATADIR}\"")
 
 target_link_libraries(crimson-common

diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
index dba1e033eb8f95609e15d038358a29fb00d93285..eee534435d6ee5d61c978027120bb7a6360fa11d 100644 (file)
--- a/src/crypto/CMakeLists.txt
+++ b/src/crypto/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_custom_target(crypto_plugins)
-set(crypto_plugin_dir ${CMAKE_INSTALL_PKGLIBDIR}/crypto)
+set(crypto_plugin_dir ${CEPH_INSTALL_PKGLIBDIR}/crypto)
 
 add_subdirectory(openssl)
 

diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt
index 0c9832ebf2e393cc8605659236b2b5c15a4d350f..bd9b00460b49b3e4504d63c86b203cd454f82da2 100644 (file)
--- a/src/erasure-code/CMakeLists.txt
+++ b/src/erasure-code/CMakeLists.txt
@@ -1,6 +1,6 @@
 ## erasure code plugins
 
-set(erasure_plugin_dir ${CMAKE_INSTALL_PKGLIBDIR}/erasure-code)
+set(erasure_plugin_dir ${CEPH_INSTALL_PKGLIBDIR}/erasure-code)
 
 #jerasure subdir must be before shec so jerasure & neon obj libs are declared
 include_directories(SYSTEM jerasure/jerasure/include)