From: Kefu Chai <kchai@redhat.com>
Date: Thu, 20 Oct 2016 08:43:42 +0000 (+0800)
Subject: cmake: link against rados_a instead of its objs
X-Git-Tag: v11.1.0~553^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16dda30d598e2f9e02f6f5c8da033eaafd30c262;p=ceph.git

cmake: link against rados_a instead of its objs

prior to this change, librbd tests link against librados_api_obj and
librados_objs, but since librados_a offers all the goodies, we can
just link against it instead.

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

diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index e2c84e34f218..f2e2d83e1606 100644
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -85,8 +85,6 @@ target_link_libraries(unittest_librbd
 add_executable(ceph_test_librbd
   test_main.cc
   ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc
-  $<TARGET_OBJECTS:librados_api_obj>
-  $<TARGET_OBJECTS:librados_objs>
   $<TARGET_OBJECTS:common_texttable_obj>)
 target_link_libraries(ceph_test_librbd
   rbd_test
@@ -96,9 +94,7 @@ target_link_libraries(ceph_test_librbd
   journal
   cls_journal_client
   cls_rbd_client
-  cls_lock_client
-  osdc
-  global
+  rados_a
   ${UNITTEST_LIBS}
   radostest)
 set_target_properties(ceph_test_librbd PROPERTIES COMPILE_FLAGS
diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt
index b2a1d8061036..2d5d92e51d0e 100644
--- a/src/test/rbd_mirror/CMakeLists.txt
+++ b/src/test/rbd_mirror/CMakeLists.txt
@@ -56,8 +56,6 @@ target_link_libraries(unittest_rbd_mirror
 add_executable(ceph_test_rbd_mirror
   test_main.cc
   ${CMAKE_SOURCE_DIR}/src/common/ContextCompletion.cc
-  $<TARGET_OBJECTS:librados_api_obj>
-  $<TARGET_OBJECTS:librados_objs>
   )
 set_target_properties(ceph_test_rbd_mirror PROPERTIES COMPILE_FLAGS
   ${UNITTEST_CXX_FLAGS})
@@ -68,11 +66,9 @@ target_link_libraries(ceph_test_rbd_mirror
   rbd_internal
   journal
   cls_rbd_client
-  cls_lock_client
   cls_journal_client
   rbd_types
-  osdc
-  global
+  rados_a
   radostest
   ${UNITTEST_LIBS}
   )