From: J. Eric Ivancich <ivancich@redhat.com>
Date: Thu, 30 Sep 2021 22:18:30 +0000 (-0400)
Subject: rados: build minimally when "WITH_MGR" is off
X-Git-Tag: v16.2.15~29^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf8fe9eea9fabecaf25ea68d3641c11476c59ad4;p=ceph.git

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>
(cherry picked from commit 15c6fb535d5c5b051f4ad9dc68e20c769b2293d7)
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a9aef68ed6d5..6f5dd11f7bf3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -601,7 +601,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 b4056fdb1ecd..7b237c01c2f8 100644
--- 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 eff00cc2a4fc..2b699f0f62fc 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -63,7 +63,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)
@@ -72,7 +74,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)