From: Kefu Chai <kchai@redhat.com>
Date: Sat, 28 May 2016 07:42:33 +0000 (+0800)
Subject: cmake: install the artifacts the packaging requires
X-Git-Tag: v11.0.0~358^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6936a811a3988b4b6d6216c7479afcf8c9e1bcde;p=ceph.git

cmake: install the artifacts the packaging requires

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7b3ee62673c1..7f9cd07c7402 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -586,6 +586,9 @@ install(TARGETS ceph-osdomap-tool DESTINATION bin)
 add_executable(ceph-monstore-tool tools/ceph_monstore_tool.cc)
 target_link_libraries(ceph-monstore-tool os global ${Boost_PROGRAM_OPTIONS_LIBRARY})
 install(TARGETS ceph-monstore-tool DESTINATION bin)
+install(PROGRAMS
+  tools/ceph-monstore-update-crush.sh
+  DESTINATION lib/ceph)
 
 add_executable(ceph-objectstore-tool
   tools/ceph_objectstore_tool.cc
@@ -635,8 +638,14 @@ if (WITH_CEPHFS)
     tools/cephfs/MDSUtility.cc)
   add_executable(cephfs-data-scan ${cephfs_data_scan_srcs})
   target_link_libraries(cephfs-data-scan librados mds osdc global
-                        cls_cephfs_client
-                        ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+    cls_cephfs_client
+    ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
+
+  install(TARGETS
+    cephfs-journal-tool
+    cephfs-table-tool
+    cephfs-data-scan
+    DESTINATION bin)
 endif (WITH_CEPHFS)
 
 set(librados_config_srcs
@@ -1058,6 +1067,7 @@ install(PROGRAMS
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-debugpack
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-coverage
+  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-crush-location
   ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ceph-post-file
   ${CMAKE_SOURCE_DIR}/src/ceph-run
   ${CMAKE_SOURCE_DIR}/src/ceph-rest-api
@@ -1147,6 +1157,7 @@ endif(BUILD_SHARED_LIBS)
     target_link_libraries(ceph-fuse ${FUSE_LIBRARIES} client global)
     set_target_properties(ceph-fuse PROPERTIES COMPILE_FLAGS "-I${FUSE_INCLUDE_DIRS}")
     install(TARGETS ceph-fuse DESTINATION bin)
+    install(PROGRAMS mount.fuse.ceph DESTINATION /sbin)
   endif(HAVE_LIBFUSE)
 endif(WITH_LIBCEPHFS)
 
@@ -1459,6 +1470,14 @@ if(${WITH_RADOSGW})
   add_subdirectory(rgw)
 endif(${WITH_RADOSGW})
 
+install(FILES
+  sample.ceph.conf
+  DESTINATION ${CMAKE_INSTALL_DOCDIR})
+install(FILES
+  fetch_config
+  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+  RENAME sample.fetch_config)
+
 # Now create a useable config.h
 configure_file(
   ${CMAKE_SOURCE_DIR}/src/include/config-h.in.cmake
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 2c4c0da2362b..07e83a1b4d70 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -372,6 +372,16 @@ target_link_libraries(ceph_xattr_bench
   ${CMAKE_DL_LIBS}
   )
 
+install(TARGETS
+  ceph_bench_log
+  ceph_kvstorebench
+  ceph_multi_stress_watch
+  ceph_objectstore_bench
+  ceph_omapbench
+  ceph_perf_local
+  ceph_xattr_bench
+  DESTINATION bin)
+
 # ceph_test_filejournal
 add_executable(ceph_test_filejournal
   test_filejournal.cc
diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt
index 6bd153f61378..512376002f63 100644
--- a/src/test/bench/CMakeLists.txt
+++ b/src/test/bench/CMakeLists.txt
@@ -73,3 +73,10 @@ add_executable(ceph_tpbench
 target_link_libraries(ceph_tpbench librados ${Boost_PROGRAM_OPTIONS_LIBRARY} global
   ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS})
 
+install(TARGETS
+  ceph_smalliobench
+  ceph_smalliobenchrbd
+  ceph_smalliobenchfs
+  ceph_smalliobenchdumb
+  ceph_tpbench
+  DESTINATION bin)
diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
index ed6429f5d33f..4f96c0ef7329 100644
--- a/src/test/erasure-code/CMakeLists.txt
+++ b/src/test/erasure-code/CMakeLists.txt
@@ -3,12 +3,16 @@ add_executable(ceph_erasure_code_benchmark
   ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
   ceph_erasure_code_benchmark.cc)
 target_link_libraries(ceph_erasure_code_benchmark osd common ${Boost_PROGRAM_OPTIONS_LIBRARY} global dl)
+install(TARGETS ceph_erasure_code_benchmark
+  DESTINATION bin)
 
 add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
 target_link_libraries(ceph_erasure_code_non_regression osd common ${Boost_PROGRAM_OPTIONS_LIBRARY} global dl)
 
 add_executable(ceph_erasure_code ceph_erasure_code.cc)
 target_link_libraries(ceph_erasure_code osd common ${Boost_PROGRAM_OPTIONS_LIBRARY} global dl)
+install(TARGETS ceph_erasure_code
+  DESTINATION bin)
 
 add_library(ec_example SHARED 
   ErasureCodePluginExample.cc
diff --git a/src/test/msgr/CMakeLists.txt b/src/test/msgr/CMakeLists.txt
index dd2e48d788b2..78b78dc72044 100644
--- a/src/test/msgr/CMakeLists.txt
+++ b/src/test/msgr/CMakeLists.txt
@@ -26,3 +26,7 @@ set_target_properties(ceph_perf_msgr_client PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(ceph_perf_msgr_client os global ${UNITTEST_LIBS})
 
+install(TARGETS
+  ceph_perf_msgr_server
+  ceph_perf_msgr_client
+  DESTINATION bin)
diff --git a/src/test/objectstore/CMakeLists.txt b/src/test/objectstore/CMakeLists.txt
index 41c727700da0..233fffafa1e1 100644
--- a/src/test/objectstore/CMakeLists.txt
+++ b/src/test/objectstore/CMakeLists.txt
@@ -5,6 +5,8 @@ add_executable(ceph_perf_objectstore
 set_target_properties(ceph_perf_objectstore PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
 target_link_libraries(ceph_perf_objectstore os osdc global ${UNITTEST_LIBS})
+install(TARGETS ceph_perf_objectstore
+  DESTINATION bin)
 
 #ceph_test_objectstore
 add_executable(ceph_test_objectstore