From: Kefu Chai <kchai@redhat.com>
Date: Thu, 21 Feb 2019 10:54:31 +0000 (+0800)
Subject: cmake: remove amqp_mock from UNITTEST_LIBS
X-Git-Tag: v14.1.0~11^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba9da1f76e0433ee38f106c9a2891f7e8c842901;p=ceph.git

cmake: remove amqp_mock from UNITTEST_LIBS

this mock library is only used by rgw tests.

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

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index fbc45c6daf5ba..8cd742a919829 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(AddCephTest)
 
 set(UNITTEST_LIBS GMock::Main GMock::GMock GTest::GTest ${CMAKE_THREAD_LIBS_INIT} 
-    ${GSSAPI_LIBRARIES} ${OPENLDAP_LIBRARIES} ${CMAKE_DL_LIBS} amqp_mock)
+    ${GSSAPI_LIBRARIES} ${OPENLDAP_LIBRARIES} ${CMAKE_DL_LIBS})
 
 add_library(unit-main OBJECT unit.cc)
 target_include_directories(unit-main PRIVATE
@@ -51,9 +51,13 @@ add_subdirectory(os)
 add_subdirectory(osd)
 add_subdirectory(osdc)
 add_subdirectory(pybind)
-if(${WITH_RADOSGW})
+if(WITH_RADOSGW)
+  set(rgw_libs rgw_a)
+  if(WITH_RADOSGW_AMQP_ENDPOINT)
+    list(APPEND rgw_libs amqp_mock)
+  endif()
   add_subdirectory(rgw)
-endif(${WITH_RADOSGW})
+endif(WITH_RADOSGW)
 if(WITH_RBD)
   add_subdirectory(rbd_mirror)
 endif(WITH_RBD)
@@ -183,7 +187,7 @@ if(${WITH_RADOSGW})
     )
   target_link_libraries(test_cors
     librados
-    rgw_a
+    ${rgw_libs}
     global
     ${BLKID_LIBRARIES}
     ${CURL_LIBRARIES}
@@ -197,7 +201,7 @@ if(${WITH_RADOSGW})
     )
   target_link_libraries(ceph_test_cls_rgw_meta
     librados
-    rgw_a
+    ${rgw_libs}
     global
     cls_version_client
     cls_log_client
@@ -223,7 +227,7 @@ if(${WITH_RADOSGW})
     )
   target_link_libraries(ceph_test_cls_rgw_log
     librados
-    rgw_a
+    ${rgw_libs}
     global
     cls_version_client
     cls_log_client
diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
index 33a2607531a1f..530753023bfa7 100644
--- a/src/test/rgw/CMakeLists.txt
+++ b/src/test/rgw/CMakeLists.txt
@@ -9,29 +9,29 @@ endif()
 #unittest_rgw_bencode
 add_executable(unittest_rgw_bencode test_rgw_bencode.cc)
 add_ceph_unittest(unittest_rgw_bencode)
-target_link_libraries(unittest_rgw_bencode rgw_a)
+target_link_libraries(unittest_rgw_bencode ${rgw_libs})
 
 #unitttest_rgw_period_history
 add_executable(unittest_rgw_period_history test_rgw_period_history.cc)
 add_ceph_unittest(unittest_rgw_period_history)
-target_link_libraries(unittest_rgw_period_history rgw_a amqp_mock)
+target_link_libraries(unittest_rgw_period_history ${rgw_libs})
 
 # unitttest_rgw_compression
 add_executable(unittest_rgw_compression
   test_rgw_compression.cc
   $<TARGET_OBJECTS:unit-main>)
 add_ceph_unittest(unittest_rgw_compression)
-target_link_libraries(unittest_rgw_compression rgw_a)
+target_link_libraries(unittest_rgw_compression ${rgw_libs})
 
 # unitttest_http_manager
 add_executable(unittest_http_manager test_http_manager.cc)
 add_ceph_unittest(unittest_http_manager)
-target_link_libraries(unittest_http_manager rgw_a)
+target_link_libraries(unittest_http_manager ${rgw_libs})
 
 # unitttest_rgw_reshard_wait
 add_executable(unittest_rgw_reshard_wait test_rgw_reshard_wait.cc)
 add_ceph_unittest(unittest_rgw_reshard_wait)
-target_link_libraries(unittest_rgw_reshard_wait rgw_a amqp_mock)
+target_link_libraries(unittest_rgw_reshard_wait ${rgw_libs})
 
 set(test_rgw_a_src
   test_rgw_common.cc)
@@ -43,7 +43,7 @@ add_executable(ceph_test_rgw_manifest
   ${test_rgw_manifest_srcs}
   )
 target_link_libraries(ceph_test_rgw_manifest
-  rgw_a
+  ${rgw_libs}
   test_rgw_a
   cls_rgw_client
   cls_lock_client
@@ -66,7 +66,7 @@ add_executable(ceph_test_rgw_obj
   ${test_rgw_obj_srcs}
   )
 target_link_libraries(ceph_test_rgw_obj
-  rgw_a
+  ${rgw_libs}
   test_rgw_a
   cls_rgw_client
   cls_lock_client
@@ -89,7 +89,7 @@ add_executable(unittest_rgw_crypto
   )
 add_ceph_unittest(unittest_rgw_crypto)
 target_link_libraries(unittest_rgw_crypto
-  rgw_a
+  ${rgw_libs}
   cls_rgw_client
   cls_lock_client
   cls_refcount_client
@@ -112,13 +112,13 @@ target_link_libraries(unittest_rgw_putobj rgw_a ${UNITTEST_LIBS})
 add_executable(ceph_test_rgw_throttle
   test_rgw_throttle.cc
   $<TARGET_OBJECTS:unit-main>)
-target_link_libraries(ceph_test_rgw_throttle rgw_a
+target_link_libraries(ceph_test_rgw_throttle ${rgw_libs}
   librados global ${UNITTEST_LIBS})
 
 add_executable(unittest_rgw_iam_policy test_rgw_iam_policy.cc)
 add_ceph_unittest(unittest_rgw_iam_policy)
 target_link_libraries(unittest_rgw_iam_policy
-  rgw_a
+  ${rgw_libs}
   cls_rgw_client
   cls_lock_client
   cls_refcount_client
@@ -140,7 +140,7 @@ add_ceph_unittest(unittest_rgw_string)
 # unitttest_rgw_dmclock_queue
 add_executable(unittest_rgw_dmclock_scheduler test_rgw_dmclock_scheduler.cc $<TARGET_OBJECTS:unit-main>)
 add_ceph_unittest(unittest_rgw_dmclock_scheduler)
-target_link_libraries(unittest_rgw_dmclock_scheduler rgw_a dmclock ${Boost_LIBRARIES})
+target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock ${Boost_LIBRARIES})
 if(WITH_BOOST_CONTEXT)
   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
   target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
@@ -149,5 +149,5 @@ endif()
 if(WITH_RADOSGW_AMQP_ENDPOINT)
   add_executable(unittest_rgw_amqp test_rgw_amqp.cc)
   add_ceph_unittest(unittest_rgw_amqp)
-  target_link_libraries(unittest_rgw_amqp rgw_a amqp_mock)
+  target_link_libraries(unittest_rgw_amqp ${rgw_libs})
 endif()