From: Kefu Chai <kchai@redhat.com>
Date: Thu, 26 May 2016 12:54:03 +0000 (+0800)
Subject: cmake: add missing obj to libosd
X-Git-Tag: v11.0.0~390^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b64dd9e833cb1b3c57c626da201843dcf30dd4b5;p=ceph.git

cmake: add missing obj to libosd

* add common_util_obj as OSD::_collect_metadata() is calling collect_sys_info(), which lives
  in util.c
* add global_common_objs as OSD::_committed_osd_maps() is calling
  queue_async_signal(), which lives in signal_handler.cc

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 51bcd9c78785..273cefdeb899 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -887,8 +887,12 @@ set(osd_srcs
 set(osd_mon_files
   mon/Monitor.cc)
 add_library(osd_mon_objs OBJECT ${osd_mon_files})
-add_library(osd STATIC ${osd_srcs} $<TARGET_OBJECTS:osd_mon_objs>
-  $<TARGET_OBJECTS:cls_references_objs> $<TARGET_OBJECTS:heap_profiler_objs>)
+add_library(osd STATIC ${osd_srcs}
+  $<TARGET_OBJECTS:osd_mon_objs>
+  $<TARGET_OBJECTS:cls_references_objs>
+  $<TARGET_OBJECTS:global_common_objs>
+  $<TARGET_OBJECTS:heap_profiler_objs>
+  $<TARGET_OBJECTS:common_util_obj>)
 target_link_libraries(osd dl leveldb ${ALLOC_LIBS})
 if(WITH_LTTNG)
   add_dependencies(osd osd-tp)