cmake: move link dependencies to rgw_a

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3cf5e730f4a47347582d3db4e202eddd223427a0..229d7428e8fc70c3fd005a893834db6edd08004f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1177,8 +1177,10 @@ if(${WITH_RADOSGW})
     rgw/rgw_xml_enc.cc)
 
   add_library(rgw_a STATIC ${rgw_a_srcs})
-
-  include_directories("${CMAKE_SOURCE_DIR}/src/civetweb/include")
+  target_include_directories(rgw_a PUBLIC "${CMAKE_SOURCE_DIR}/src/civetweb/include")
+  target_link_libraries(rgw_a librados cls_rgw_client cls_refcount_client
+    cls_log_client cls_statelog_client cls_timeindex_client cls_version_client
+    cls_replica_log_client cls_user_client curl global expat)
 
   set(radosgw_srcs
     rgw/rgw_resolve.cc

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 1ff12b0186575db6bcde3cc53faac0679e522ff1..0b06e77ead2db769a8b51f48ae7149973b89adab 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1529,21 +1529,6 @@ if(${WITH_RADOSGW})
     )
   target_link_libraries(test_rgw_manifest
     rgw_a
-    cls_rgw_client
-    cls_lock_client
-    cls_refcount_client
-    cls_log_client
-    cls_statelog_client
-    cls_timeindex_client
-    cls_version_client
-    cls_replica_log_client
-    cls_kvs
-    cls_user_client
-    librados
-    global
-    curl
-    expat
-    ${BLKID_LIBRARIES}
     ${CMAKE_DL_LIBS}
     ${ALLOC_LIBS}
     ${UNITTEST_LIBS}
@@ -1589,19 +1574,7 @@ if(${WITH_RADOSGW})
     $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(test_cls_rgw_meta
-    librados
     rgw_a
-    global
-    curl
-    expat
-    cls_version_client
-    cls_log_client
-    cls_statelog_client
-    cls_refcount_client
-    cls_rgw_client
-    cls_user_client
-    cls_lock_client
-    cls_timeindex_client
     boost_regex
     ${Boost_REGEX_LIBRARY}
     ${BLKID_LIBRARIES}
@@ -1618,7 +1591,6 @@ if(${WITH_RADOSGW})
     $<TARGET_OBJECTS:heap_profiler_objs>
     )
   target_link_libraries(test_cls_rgw_log
-    librados
     rgw_a
     global
     curl
@@ -1630,12 +1602,8 @@ if(${WITH_RADOSGW})
     cls_rgw_client
     cls_user_client
     cls_lock_client
-<<<<<<< HEAD
-    ${Boost_REGEX_LIBRARY}
-=======
     cls_timeindex_client
-    boost_regex
->>>>>>> cmake: add cls_timeindex to rgw targets
+    ${Boost_REGEX_LIBRARY}
     ${BLKID_LIBRARIES}
     ${CMAKE_DL_LIBS}
     ${ALLOC_LIBS}
@@ -1654,18 +1622,6 @@ if(${WITH_RADOSGW})
     )
   target_link_libraries(test_cls_rgw_opstate
     rgw_a
-    librados
-    cls_version_client
-    cls_log_client
-    cls_statelog_client
-    cls_timeindex_client
-    cls_refcount_client
-    cls_rgw_client
-    cls_user_client
-    cls_lock_client
-    global
-    curl
-    expat
     ${BLKID_LIBRARIES}
     ${CMAKE_DL_LIBS}
     ${ALLOC_LIBS}