From: 胡玮文 <huww98@outlook.com>
Date: Wed, 14 Apr 2021 18:00:38 +0000 (+0800)
Subject: cmake: cleanup CMake install src path
X-Git-Tag: v17.1.0~116^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7b782dc9bf78a015ec5530d3c48f486d7b67110;p=ceph.git

cmake: cleanup CMake install src path

src relative paths are interpreted with respect to the current source directory,
so removing unneeded path prefixes

Signed-off-by: 胡玮文 <huww98@outlook.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e32e4029b84..1f81c22eb7a8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -755,8 +755,8 @@ install(PROGRAMS
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-post-file
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-crash
-  ${CMAKE_SOURCE_DIR}/src/ceph-run
-  ${CMAKE_SOURCE_DIR}/src/ceph-clsinfo
+  ceph-run
+  ceph-clsinfo
   DESTINATION bin)
 install(PROGRAMS
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/init-ceph
@@ -775,7 +775,7 @@ install(PROGRAMS
   DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/ceph)
 
 install(PROGRAMS
-  ${CMAKE_SOURCE_DIR}/src/ceph-create-keys
+  ceph-create-keys
   DESTINATION sbin)
 
 add_subdirectory(bash_completion)
@@ -800,7 +800,7 @@ if(WITH_LIBCEPHFS)
   endif(ENABLE_SHARED)
   install(TARGETS cephfs DESTINATION ${CMAKE_INSTALL_LIBDIR})
   install(DIRECTORY
-    "${CMAKE_SOURCE_DIR}/src/include/cephfs"
+    "include/cephfs"
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
   set(ceph_syn_srcs
     ceph_syn.cc
@@ -858,9 +858,9 @@ if(WITH_RBD)
   endif()
 
   install(PROGRAMS
-    ${CMAKE_SOURCE_DIR}/src/ceph-rbdnamer
-    ${CMAKE_SOURCE_DIR}/src/rbd-replay-many
-    ${CMAKE_SOURCE_DIR}/src/rbdmap
+    ceph-rbdnamer
+    rbd-replay-many
+    rbdmap
     DESTINATION ${CMAKE_INSTALL_BINDIR})
   add_subdirectory(rbd_replay)
 endif(WITH_RBD)
@@ -1016,4 +1016,3 @@ if(DOXYGEN_FOUND)
     rgw
     COMMENT "Generate C++ documentation")
 endif()
-
diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
index 4ff35011058e..cd9b27623d20 100644
--- a/src/pybind/CMakeLists.txt
+++ b/src/pybind/CMakeLists.txt
@@ -37,8 +37,8 @@ execute_process(
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 install(FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/ceph_argparse.py
-  ${CMAKE_CURRENT_SOURCE_DIR}/ceph_daemon.py
+  ceph_argparse.py
+  ceph_daemon.py
   DESTINATION ${PYTHON3_INSTDIR})
 
 if(WITH_MGR)