From: Kefu Chai <kchai@redhat.com>
Date: Tue, 20 Jul 2021 12:44:39 +0000 (+0800)
Subject: cmake: push dashboard build logic down
X-Git-Tag: v17.1.0~1313^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=993e250682b6c998b16f5f5be9554385d6838073;p=ceph.git

cmake: push dashboard build logic down

it's simpler to build dashboard in dashboard/CMakeLists.txt

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

diff --git a/src/pybind/mgr/CMakeLists.txt b/src/pybind/mgr/CMakeLists.txt
index 264c6ed40b49..a06dfbbc2f14 100644
--- a/src/pybind/mgr/CMakeLists.txt
+++ b/src/pybind/mgr/CMakeLists.txt
@@ -6,22 +6,7 @@ set(mgr_module_install_excludes
   PATTERN "constraints*.txt" EXCLUDE
   PATTERN "tests/*" EXCLUDE)
 
-install(DIRECTORY dashboard
-  DESTINATION ${CEPH_INSTALL_DATADIR}/mgr
-  ${mgr_module_install_excludes}
-  PATTERN "frontend/*" EXCLUDE
-  PATTERN ".*" EXCLUDE)
-
-if(WITH_MGR_DASHBOARD_FRONTEND)
-  # build from source
-  add_subdirectory(dashboard)
-else()
-  # prebuilt
-  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/frontend/dist
-    DESTINATION ${CEPH_INSTALL_DATADIR}/mgr/dashboard/frontend)
-  install(FILES dashboard/frontend/package.json
-    DESTINATION ${CEPH_INSTALL_DATADIR}/mgr/dashboard/frontend)
-endif()
+add_subdirectory(dashboard)
 
 if(WITH_MGR_ROOK_CLIENT)
   add_subdirectory(rook)
diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
index 04a7dc17de18..40bb66650d24 100644
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
@@ -1,6 +1,20 @@
-add_subdirectory(frontend)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DESTINATION ${CEPH_INSTALL_DATADIR}/mgr
+  ${mgr_module_install_excludes}
+  PATTERN "frontend/*" EXCLUDE
+  PATTERN ".*" EXCLUDE)
 
-if(WITH_TESTS)
-  include(AddCephTest)
-  add_tox_test(mgr-dashboard TOX_ENVS py3 lint check openapi-check)
+if(WITH_MGR_DASHBOARD_FRONTEND)
+  # build from source
+  add_subdirectory(frontend)
+  if(WITH_TESTS)
+    include(AddCephTest)
+    add_tox_test(mgr-dashboard TOX_ENVS py3 lint check openapi-check)
+  endif()
+else()
+  # prebuilt
+  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/frontend/dist
+    DESTINATION ${CEPH_INSTALL_DATADIR}/mgr/dashboard/frontend)
+  install(FILES frontend/package.json
+    DESTINATION ${CEPH_INSTALL_DATADIR}/mgr/dashboard/frontend)
 endif()