From 142be53986171adba82ed0d8f7f44850db8f6ce2 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 3 Jun 2019 16:36:12 +0800 Subject: [PATCH] cmake: link rgw tests against ${rgw_libs} if `WITH_RADOSGW_AMQP_ENDPOINT` is enabled, we should always link rgw applications against `RabbitMQ::RabbitMQ` or `amqp_mock`, so, to simplify the linkage dependencies, we should just use `${rgw_libs}` instead of using `rgw_a` directly. Signed-off-by: Kefu Chai --- src/test/rgw/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt index 4e399d75ba2..648f14b8365 100644 --- a/src/test/rgw/CMakeLists.txt +++ b/src/test/rgw/CMakeLists.txt @@ -107,7 +107,7 @@ target_link_libraries(unittest_rgw_crypto add_executable(unittest_rgw_putobj test_rgw_putobj.cc) add_ceph_unittest(unittest_rgw_putobj) -target_link_libraries(unittest_rgw_putobj rgw_a ${UNITTEST_LIBS}) +target_link_libraries(unittest_rgw_putobj ${rgw_libs} ${UNITTEST_LIBS}) add_executable(ceph_test_rgw_throttle test_rgw_throttle.cc @@ -157,11 +157,11 @@ endif() add_executable(unittest_rgw_xml test_rgw_xml.cc) add_ceph_unittest(unittest_rgw_xml) -target_link_libraries(unittest_rgw_xml rgw_a ${EXPAT_LIBRARIES}) +target_link_libraries(unittest_rgw_xml ${rgw_libs} ${EXPAT_LIBRARIES}) # unittest_rgw_arn add_executable(unittest_rgw_arn test_rgw_arn.cc) add_ceph_unittest(unittest_rgw_arn) -target_link_libraries(unittest_rgw_arn rgw_a) +target_link_libraries(unittest_rgw_arn ${rgw_libs}) -- 2.47.3