From 16dda30d598e2f9e02f6f5c8da033eaafd30c262 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 20 Oct 2016 16:43:42 +0800 Subject: [PATCH] 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 --- src/test/librbd/CMakeLists.txt | 6 +----- src/test/rbd_mirror/CMakeLists.txt | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt index e2c84e34f21..f2e2d83e160 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_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 b2a1d806103..2d5d92e51d0 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 - $ - $ ) 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} ) -- 2.47.3