From: Kefu Chai Date: Wed, 16 Oct 2019 08:44:01 +0000 (+0800) Subject: cmake: dashboard: enable frontend on arm64 X-Git-Tag: v15.1.0~1236^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ccdedcf4d59dafc5f556d25778fac0e432abb286;p=ceph.git cmake: dashboard: enable frontend on arm64 it was disable when we added dashboard(v2) to ceph in 24e216b519795ba6a5d427790399a595fbb19b27 because some npm package did not install or build on arm64. but "mgr-dashboard-frontend-build" now builds fine at the time of writing. so let's enable it! Signed-off-by: Kefu Chai --- diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt index 8f82cc919c51..472aed95593f 100644 --- a/src/pybind/mgr/dashboard/CMakeLists.txt +++ b/src/pybind/mgr/dashboard/CMakeLists.txt @@ -17,7 +17,7 @@ function(add_npm_command) COMMENT ${NC_COMMENT}) endfunction(add_npm_command) -if(WITH_MGR_DASHBOARD_FRONTEND AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") +if(WITH_MGR_DASHBOARD_FRONTEND) if(WITH_SYSTEM_NPM) set(mgr-dashboard-nodeenv-dir ) @@ -121,7 +121,7 @@ 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 AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") +endif(WITH_MGR_DASHBOARD_FRONTEND) if(WITH_TESTS) include(AddCephTest)