cmake: radosgw, radosgw-admin related fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ced2abff47d71adc8fa8104f38e311520e7c9da..5cb9b9d211a5455fcc78041923a26ec1542af95a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -737,31 +737,6 @@ if(${WITH_RADOSGW})
 
   include_directories("${CMAKE_SOURCE_DIR}/src/civetweb/include")
 
-  set(radosgw_srcs
-    rgw/rgw_civetweb.cc
-    rgw/rgw_resolve.cc
-    rgw/rgw_rest.cc
-    rgw/rgw_rest_swift.cc
-    rgw/rgw_rest_s3.cc
-    rgw/rgw_rest_usage.cc
-    rgw/rgw_rest_user.cc
-    rgw/rgw_rest_bucket.cc
-    rgw/rgw_http_client.cc
-    rgw/rgw_swift.cc
-    rgw/rgw_swift_auth.cc
-    rgw/rgw_main.cc
-    rgw/rgw_keystone.cc
-    rgw/rgw_loadgen.cc
-    rgw/rgw_rest_client.cc
-    rgw/rgw_metadata.cc
-    rgw/rgw_rest_config.cc
-    rgw/rgw_rest_conn.cc
-    rgw/rgw_rest_log.cc
-    rgw/rgw_rest_metadata.cc
-    rgw/rgw_rest_opstate.cc
-    rgw/rgw_rest_replica_log.cc
-    ${kvs_srcs})
-
   set(radosgw_srcs
     rgw/rgw_resolve.cc
     rgw/rgw_rest.cc
@@ -785,6 +760,9 @@ if(${WITH_RADOSGW})
     civetweb/src/civetweb.c
     rgw/rgw_main.cc)
 
+  set(radosgw_admin_srcs
+    rgw/rgw_admin.cc)
+
   add_executable(radosgw ${radosgw_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
   target_link_libraries(radosgw rgw_a librados
     cls_rgw_client cls_lock_client cls_refcount_client
@@ -792,4 +770,12 @@ if(${WITH_RADOSGW})
     cls_replica_log_client cls_user_client
     curl expat global fcgi resolv ${TCMALLOC_LIBS})
   install(TARGETS radosgw DESTINATION bin)
+
+  add_executable(radosgw-admin ${radosgw_admin_srcs} $<TARGET_OBJECTS:heap_profiler_objs>)
+  target_link_libraries(radosgw-admin rgw_a librados
+    cls_rgw_client cls_lock_client cls_refcount_client
+    cls_log_client cls_statelog_client cls_version_client
+    cls_replica_log_client cls_user_client
+    curl expat global fcgi resolv ${TCMALLOC_LIBS})
+  install(TARGETS radosgw-admin DESTINATION bin)
 endif(${WITH_RADOSGW})