From: Kefu Chai <kchai@redhat.com>
Date: Wed, 16 Oct 2019 08:50:47 +0000 (+0800)
Subject: cmake: dashboard: move "if(WITH_MGR_DASHBOARD_FRONTEND)" up
X-Git-Tag: v15.1.0~1236^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d3ac8b132d466bc758e28450236811b630f641dd;p=ceph.git

cmake: dashboard: move "if(WITH_MGR_DASHBOARD_FRONTEND)" up

two reasons:

* we don't need to run the tox test if WITH_MGR_DASHBOARD_FRONTEND is
  OFF
* better readability

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

diff --git a/src/pybind/mgr/CMakeLists.txt b/src/pybind/mgr/CMakeLists.txt
index 2b5f4a7d4ad73..ef07dac77c399 100644
--- a/src/pybind/mgr/CMakeLists.txt
+++ b/src/pybind/mgr/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(dashboard)
+if(WITH_MGR_DASHBOARD_FRONTEND)
+  add_subdirectory(dashboard)
+endif()
 add_subdirectory(insights)
 add_subdirectory(ansible)
 add_subdirectory(orchestrator_cli)
diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
index 472aed95593f7..9988b8ea71cda 100644
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
@@ -17,8 +17,6 @@ function(add_npm_command)
     COMMENT ${NC_COMMENT})
 endfunction(add_npm_command)
 
-if(WITH_MGR_DASHBOARD_FRONTEND)
-
 if(WITH_SYSTEM_NPM)
   set(mgr-dashboard-nodeenv-dir )
   set(nodeenv "")
@@ -121,7 +119,6 @@ add_custom_target(mgr-dashboard-frontend-build
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend)
 
 add_dependencies(tests mgr-dashboard-frontend-build)
-endif(WITH_MGR_DASHBOARD_FRONTEND)
 
 if(WITH_TESTS)
   include(AddCephTest)