From: Kefu Chai <kchai@redhat.com>
Date: Fri, 15 Feb 2019 11:57:02 +0000 (+0800)
Subject: cmake: move install(.. ./mgr) down to mgr
X-Git-Tag: v14.1.0~89^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6d10abcc701e6e4636499331c46c549d5a84d94;p=ceph.git

cmake: move install(.. ./mgr) down to mgr

this helps to modularize the CMakeLists.txt

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

diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
index 1538b6fec99..664543172a1 100644
--- a/src/pybind/CMakeLists.txt
+++ b/src/pybind/CMakeLists.txt
@@ -96,15 +96,5 @@ if(WITH_MGR)
       message(WARNING "could not determine ssl version of python crypto lib")
     endif()
   endif(USE_OPENSSL)
-
-  # Location needs to match default setting for mgr_module_path, currently:
-  # OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr")
-  install(DIRECTORY
-    ${CMAKE_CURRENT_SOURCE_DIR}/mgr
-    DESTINATION ${CMAKE_INSTALL_PKGLIBDIR}
-    REGEX ".*/CMakeLists.txt" EXCLUDE
-    REGEX ".*/\\.gitignore" EXCLUDE
-    REGEX ".*/hello/.*" EXCLUDE
-    REGEX ".*/osd_perf_query/.*" EXCLUDE)
   add_subdirectory(mgr)
 endif(WITH_MGR)
diff --git a/src/pybind/mgr/CMakeLists.txt b/src/pybind/mgr/CMakeLists.txt
index 8f48689fe40..216cda718c3 100644
--- a/src/pybind/mgr/CMakeLists.txt
+++ b/src/pybind/mgr/CMakeLists.txt
@@ -2,3 +2,13 @@ add_subdirectory(dashboard)
 add_subdirectory(insights)
 add_subdirectory(ansible)
 add_subdirectory(orchestrator_cli)
+
+# Location needs to match default setting for mgr_module_path, currently:
+# OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr")
+install(DIRECTORY
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  DESTINATION ${CMAKE_INSTALL_PKGLIBDIR}
+  REGEX "CMakeLists.txt" EXCLUDE
+  REGEX "\\.gitignore" EXCLUDE
+  REGEX "hello/.*" EXCLUDE
+  REGEX "osd_perf_query/.*" EXCLUDE)