From: Ricardo Dias <rdias@suse.com>
Date: Thu, 19 Apr 2018 09:19:47 +0000 (+0100)
Subject: Merge pull request #21466 from jcsp/wip-dashboard-cmake-all
X-Git-Tag: v13.1.0~191
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47a55cf52e806da8095f2f593aad4ac84d9a7c15;p=ceph.git

Merge pull request #21466 from jcsp/wip-dashboard-cmake-all

cmake: include frontend build in 'all' target

Reviewed-by: Ricardo Dias <rdias@suse.com>
---

47a55cf52e806da8095f2f593aad4ac84d9a7c15
diff --cc src/pybind/mgr/dashboard/CMakeLists.txt
index 5bdc8a3ed93,f2b67dd8c4c..20df9e37661
--- a/src/pybind/mgr/dashboard/CMakeLists.txt
+++ b/src/pybind/mgr/dashboard/CMakeLists.txt
@@@ -70,7 -71,9 +70,8 @@@ add_custom_command
    COMMENT "dashboard frontend is being created"
  )
  add_custom_target(mgr-dashboard-frontend-build
+   ALL
    DEPENDS frontend/dist mgr-dashboard-frontend-deps
 -  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
 -)
 -add_dependencies(ceph-mgr 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 AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")