RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: link against rados_a instead of its objs

Browse Source 
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>
This commit is contained in:
Kefu Chai 2016-10-20 16:43:42 +08:00
parent f28481a5f5
commit 16dda30d59
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/librbd/CMakeLists.txt
View File

@ -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

6
src/test/rbd_mirror/CMakeLists.txt
View File

@ -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}
)