cmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage

This now matches the autotools configuration and fixes the failed
assertion during test execution.

Fixes: http://tracker.ceph.com/issues/16882
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/librados/CMakeLists.txt b/src/librados/CMakeLists.txt
index 0ce0c4848d45079b4a96ce8dfff6dac2580c2a79..d7d01a699be9c1e593012952735167b561079313 100644 (file)
--- a/src/librados/CMakeLists.txt
+++ b/src/librados/CMakeLists.txt
@@ -2,8 +2,10 @@ add_library(librados_objs OBJECT
   IoCtxImpl.cc
   RadosXattrIter.cc
   RadosClient.cc)
+add_library(librados_api_obj OBJECT
+  librados.cc)
 add_library(librados ${CEPH_SHARED}
-  librados.cc
+  $<TARGET_OBJECTS:librados_api_obj>
   $<TARGET_OBJECTS:librados_objs>
   $<TARGET_OBJECTS:common_buffer_obj>)
 add_dependencies(librados osdc)

diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
index edd3ed679d82e1ddec321aec7d5cb9bf803d0794..a85c2b16eda499db91991430b20eb00b8467924d 100644 (file)
--- a/src/test/librbd/CMakeLists.txt
+++ b/src/test/librbd/CMakeLists.txt
@@ -86,11 +86,12 @@ 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_OBJECTS:parse_secret_objs>
   )
 target_link_libraries(ceph_test_librbd
-  librados
   rbd_test
   rbd_api
   rbd_internal

diff --git a/src/test/rbd_mirror/CMakeLists.txt b/src/test/rbd_mirror/CMakeLists.txt
index 84b8acd0132d5c82a11d0c4e01c1fddc982f1f98..caa252ed0993e12c21efd0c55b419b2bda457cc2 100644 (file)
--- a/src/test/rbd_mirror/CMakeLists.txt
+++ b/src/test/rbd_mirror/CMakeLists.txt
@@ -56,6 +56,8 @@ 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})
@@ -69,7 +71,6 @@ target_link_libraries(ceph_test_rbd_mirror
   cls_lock_client
   cls_journal_client
   rbd_types
-  librados
   osdc
   global
   radostest