cmake: make -DWITH_MGR=OFF work.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44b5bbd259c1c3b0eba53f3423cc9e9b1239dfe3..c56110a184f8322056b659510cf88492051c708a 100644 (file)
--- 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 374c8125dd7a0f0a809b16d4a3425f43eb86375b..6dc19913d05f9909a0bb691ce7793077e147e0a6 100644 (file)
--- 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)