cmake: expose libos from libosd

* expose "os" from "osd" so its consumers do not need to link against "os". * remove "${LEVELDB_LIBRARIES}" from "osd", as "osd" does not reference leveldb directly. the only consumer of leveldb is "kv". Signed-off-by: Kefu Chai <kchai@redhat.com>
ceph · Aug 15, 2018 · 923370b · 923370b
1 parent 7790657
commit 923370b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -506,7 +506,7 @@ set(ceph_osd_srcs
   ceph_osd.cc)
 add_executable(ceph-osd ${ceph_osd_srcs})
 add_dependencies(ceph-osd erasure_code_plugins)
-target_link_libraries(ceph-osd osd os global-static common
+target_link_libraries(ceph-osd osd global-static common
   ${BLKID_LIBRARIES})
 if(WITH_FUSE)
   target_link_libraries(ceph-osd ${FUSE_LIBRARIES})

diff --git a/src/osd/CMakeLists.txt b/src/osd/CMakeLists.txt
@@ -43,10 +43,9 @@ endif()
 add_library(osd STATIC ${osd_srcs}
   $<TARGET_OBJECTS:cls_references_objs>
   $<TARGET_OBJECTS:global_common_objs>)
-target_link_libraries(osd PRIVATE
-  os dmclock heap_profiler cpu_profiler
-  ${LEVELDB_LIBRARIES}
-  ${CMAKE_DL_LIBS})
+target_link_libraries(osd
+  PUBLIC os
+  PRIVATE dmclock heap_profiler cpu_profiler ${CMAKE_DL_LIBS})
 if(WITH_LTTNG)
   add_dependencies(osd osd-tp pg-tp)
 endif()