cmake: link librbd against librados not rados_a

link librados.so in hope to reduce the size of librdb, also the size of
debug-info.

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

diff --git a/src/librbd/CMakeLists.txt b/src/librbd/CMakeLists.txt
index f6aa8dc92598521952599aec4fa52ae18fff5312..12d585021f77969f64950dfa02cad071e47fcd11 100644 (file)
--- a/src/librbd/CMakeLists.txt
+++ b/src/librbd/CMakeLists.txt
@@ -110,6 +110,8 @@ add_library(rbd_internal STATIC
 if(WITH_LTTNG)
   add_dependencies(rbd_internal librbd-tp)
 endif()
+target_link_libraries(rbd_internal PRIVATE
+  osdc)
 
 add_library(librbd ${CEPH_SHARED}
   librbd.cc)
@@ -119,7 +121,6 @@ target_link_libraries(librbd PRIVATE
   rbd_types
   journal
   librados 
-  osdc
   cls_rbd_client 
   cls_lock_client 
   cls_journal_client 

diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index 1b32d714454aca87b6bea4b4a89beeaaad4add70..8aa61a9456f048a63e79befe46c60ef3e7784563 100644 (file)
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -107,7 +107,7 @@ target_link_libraries(ceph_test_librbd
   journal
   cls_journal_client
   cls_rbd_client
-  rados_a
+  librados
   ${UNITTEST_LIBS}
   radostest)
 target_compile_definitions(ceph_test_librbd PUBLIC "-DTEST_LIBRBD_INTERNALS")

diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt
index 7e1df8630d569f87328ceb35d841eeb5212ea3fa..dc8aafe8ec3700d6a3f7af3c0a188e069a05ac24 100644 (file)
--- a/src/test/rbd_mirror/CMakeLists.txt
+++ b/src/test/rbd_mirror/CMakeLists.txt
@@ -80,7 +80,7 @@ target_link_libraries(ceph_test_rbd_mirror
   cls_rbd_client
   cls_journal_client
   rbd_types
-  rados_a
+  librados
   radostest
   ${UNITTEST_LIBS}
   )