]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: add missing obj to libosd
authorKefu Chai <kchai@redhat.com>
Thu, 26 May 2016 12:54:03 +0000 (20:54 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 27 May 2016 16:34:52 +0000 (00:34 +0800)
* 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>
src/CMakeLists.txt

index 51bcd9c78785e721c1a28abbb5d0e5f6aed441f1..273cefdeb899785133d75f30b262dd9032cf7d2c 100644 (file)
@@ -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)