From d3ac8b132d466bc758e28450236811b630f641dd Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 16 Oct 2019 16:50:47 +0800 Subject: [PATCH] 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 --- src/pybind/mgr/CMakeLists.txt | 4 +++- src/pybind/mgr/dashboard/CMakeLists.txt | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/CMakeLists.txt b/src/pybind/mgr/CMakeLists.txt index 2b5f4a7d4ad..ef07dac77c3 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 472aed95593..9988b8ea71c 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) -- 2.47.3