RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 09:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: do not include Monitor.cc in osd

Browse Source 
Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2017-05-31 12:06:26 +08:00
parent edd41a7015
commit d104236187
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mon/CMakeLists.txt
View File

@ -1,7 +1,3 @@
set(osd_mon_files
Monitor.cc)
add_library(osd_mon_objs OBJECT ${osd_mon_files})
set(lib_mon_srcs
${CMAKE_SOURCE_DIR}/src/auth/cephx/CephxKeyServer.cc
${CMAKE_SOURCE_DIR}/src/auth/cephx/CephxServiceHandler.cc
@ -14,6 +10,7 @@ set(lib_mon_srcs
FSCommands.cc
MgrMonitor.cc
MgrStatMonitor.cc
Monitor.cc
MonmapMonitor.cc
LogMonitor.cc
AuthMonitor.cc
@ -23,7 +20,10 @@ set(lib_mon_srcs
PGMonitor.cc
PGMap.cc
ConfigKeyService.cc)
add_library(mon STATIC ${lib_mon_srcs} $<TARGET_OBJECTS:mon_common_objs>
$<TARGET_OBJECTS:kv_objs> $<TARGET_OBJECTS:osd_mon_objs>
$<TARGET_OBJECTS:common_util_obj> $<TARGET_OBJECTS:heap_profiler_objs>)
add_library(mon STATIC
${lib_mon_srcs}
$<TARGET_OBJECTS:mon_common_objs>
$<TARGET_OBJECTS:kv_objs>
$<TARGET_OBJECTS:common_util_obj>
$<TARGET_OBJECTS:heap_profiler_objs>)
target_link_libraries(mon ${ALLOC_LIBS})

1
src/osd/CMakeLists.txt
View File

@ -37,7 +37,6 @@ if(HAS_VTA)
PROPERTIES COMPILE_FLAGS -fno-var-tracking-assignments)
endif()
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>