From bac9caf71bfa49be98f60026209e913eae9b9c3f Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Mon, 21 May 2018 17:55:13 +0800 Subject: [PATCH] cmake: make -DWITH_MGR=OFF work. Signed-off-by: Jianpeng Ma --- src/CMakeLists.txt | 2 +- src/test/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 44b5bbd259c1..c56110a184f8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1126,7 +1126,7 @@ if(WITH_LTTNG) add_dependencies(vstart tracepoint_libraries) endif(WITH_LTTNG) -if(WITH_MGR_DASHBOARD_FRONTEND AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") +if(WITH_MGR AND WITH_MGR_DASHBOARD_FRONTEND AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64") add_dependencies(vstart mgr-dashboard-frontend-build) endif() diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 374c8125dd7a..6dc19913d05f 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -520,7 +520,6 @@ install(TARGETS #following dependencies are run inside make check unit tests add_dependencies(tests ceph-mon - ceph-mgr ceph-authtool get_command_descriptions crushtool @@ -542,6 +541,9 @@ add_dependencies(tests ceph_erasure_code ceph-disk cython_modules) +if(WITH_MGR) + add_dependencies(tests ceph-mgr) +endif() if(WITH_RBD) add_dependencies(tests unittest_librbd rbd) if(FREEBSD) -- 2.47.3