rados: build minimally when "WITH_MGR" is off

Minimize footprint of the MGR when WITH_MGR is off. Include the
minimal in MON. Don't include any MGR tests.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf18423a45b8c7cec170560285b6b2eb71e35049..1cda11504a79861744826a5c39af676e981ca4b2 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -615,7 +615,9 @@ if(WITH_LIBRADOSSTRIPER)
   add_subdirectory(libradosstriper)
 endif()
 
-add_subdirectory(mgr)
+if(WITH_MGR)
+  add_subdirectory(mgr)
+endif()
 
 set(librados_config_srcs
   librados-config.cc)

diff --git a/src/mon/CMakeLists.txt b/src/mon/CMakeLists.txt
index b4056fdb1ecd180cd279933604e7e25cf8d3a447..7b237c01c2f84511ffb71b9ac5a47979054c092a 100644 (file)
--- a/src/mon/CMakeLists.txt
+++ b/src/mon/CMakeLists.txt
@@ -24,7 +24,11 @@ set(lib_mon_srcs
   ../mds/MDSAuthCaps.cc
   ../mgr/mgr_commands.cc
   ../osd/OSDCap.cc
-  $<TARGET_OBJECTS:mgr_cap_obj>)
+  ../mgr/MgrCap.cc)
+
+if(TARGET mgr_cap_obj)
+  list(APPEND lib_mon_srcs $<TARGET_OBJECTS:mgr_cap_obj>)
+endif()
 
 if(HAVE_GSSAPI)
   list(APPEND lib_mon_srcs

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 70b814c9ce206ea29ed909b9d160509b48463159..985c9b6d4e8b4a1b4c3db2889312c1698bd758c5 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -64,7 +64,9 @@ if(NOT WIN32)
   add_subdirectory(libcephsqlite)
   add_subdirectory(client)
   add_subdirectory(mon)
-  add_subdirectory(mgr)
+  if(WITH_MGR)
+    add_subdirectory(mgr)
+  endif()
   add_subdirectory(msgr)
   add_subdirectory(neorados)
   add_subdirectory(objectstore)
@@ -73,7 +75,7 @@ if(NOT WIN32)
   add_subdirectory(osd)
   add_subdirectory(osdc)
   add_subdirectory(immutable_object_cache)
-endif()
+endif(NOT WIN32)
 
 if(WITH_RADOSGW)
   set(rgw_libs rgw_a)