]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake: install ceph-mgr and its python modules
authorTim Serong <tserong@suse.com>
Wed, 7 Sep 2016 05:39:36 +0000 (15:39 +1000)
committerJohn Spray <john.spray@redhat.com>
Thu, 29 Sep 2016 16:27:07 +0000 (17:27 +0100)
Signed-off-by: Tim Serong <tserong@suse.com>
src/CMakeLists.txt
src/pybind/CMakeLists.txt

index 5428d264ca7a64df2073450a3679f2c1246cefb0..caab0a37cd37a93bb77e5e7c139a4577a15b8769 100644 (file)
@@ -532,6 +532,7 @@ if (WITH_MGR)
   target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}")
   target_link_libraries(ceph-mgr mds osdc global
       -lboost_python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${TCMALLOC_LIBS})
+  install(TARGETS ceph-mgr DESTINATION bin)
 endif (WITH_MGR)
 
 set(librados_config_srcs
index 8449e15200e505158672cd499e6f0b08ac7e25ba..6be1930b923c08ead3f85e900f1a4874a9a166ce 100644 (file)
@@ -55,3 +55,11 @@ endforeach()
 install(FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/ceph_rest_api.py
   DESTINATION ${PYTHON_INSTDIR})
+
+if(WITH_MGR)
+  # Needs to match src/common/config_opts.h, which has:
+  # OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr")
+  install(DIRECTORY
+    ${CMAKE_CURRENT_SOURCE_DIR}/mgr
+    DESTINATION ${CMAKE_INSTALL_PKGLIBDIR})
+endif(WITH_MGR)