From b64ab8102629bbf4228a51fc48b0fa34fd5a3744 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 27 Feb 2019 14:57:53 +0800 Subject: [PATCH] cmake: move rgw tests targets down to end so we can reference `RabbitMQ::RabbitMQ` which is defined after `find_package(RabbitMQ REQUIRED)`. Signed-off-by: Kefu Chai --- src/rgw/CMakeLists.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 6d42db2e19aee..c577ea433c4af 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -1,22 +1,3 @@ -if(WITH_TESTS) -add_executable(ceph_rgw_jsonparser - rgw_jsonparser.cc) -target_link_libraries(ceph_rgw_jsonparser - rgw_a - global rabbitmq) - -add_executable(ceph_rgw_multiparser - rgw_multiparser.cc) -target_link_libraries(ceph_rgw_multiparser - rgw_a - global rabbitmq) - -install(TARGETS - ceph_rgw_jsonparser - ceph_rgw_multiparser - DESTINATION bin) -endif(WITH_TESTS) - add_custom_target(civetweb_h COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/src/include/civetweb" @@ -372,3 +353,22 @@ endif() if(WITH_BOOST_CONTEXT) target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context) endif() + +if(WITH_TESTS) + add_executable(ceph_rgw_jsonparser + rgw_jsonparser.cc) + target_link_libraries(ceph_rgw_jsonparser + rgw_a + global rabbitmq) + + add_executable(ceph_rgw_multiparser + rgw_multiparser.cc) + target_link_libraries(ceph_rgw_multiparser + rgw_a + global rabbitmq) + + install(TARGETS + ceph_rgw_jsonparser + ceph_rgw_multiparser + DESTINATION bin) +endif(WITH_TESTS) -- 2.39.5