]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21466 from jcsp/wip-dashboard-cmake-all
authorRicardo Dias <rdias@suse.com>
Thu, 19 Apr 2018 09:19:47 +0000 (10:19 +0100)
committerGitHub <noreply@github.com>
Thu, 19 Apr 2018 09:19:47 +0000 (10:19 +0100)
cmake: include frontend build in 'all' target

Reviewed-by: Ricardo Dias <rdias@suse.com>
1  2 
src/pybind/mgr/dashboard/CMakeLists.txt

index 5bdc8a3ed9358cda0c6ce5771b85fb3c97eb4c3b,f2b67dd8c4c7e0b62cbc583693fead9e36fee96d..20df9e37661802a148fff7e3dca4ea723f1ad820
@@@ -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")