From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Oct 2017 02:57:43 +0000 (+0800)
Subject: cmake: link librbd against librados not rados_a
X-Git-Tag: v13.0.1~396^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11f8770b345207a646c136053db6d8d3aafd86c3;p=ceph.git

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 f6aa8dc92598..12d585021f77 100644
--- 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 1b32d714454a..8aa61a9456f0 100644
--- 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 7e1df8630d56..dc8aafe8ec37 100644
--- 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}
   )