cmake: let vstart depend on radosgwd

in f528f173, in cmake, the target of executable "radosgw" is renamed
to "radosgwd",  and the static library of "radosgw_a" was renamed to
"radosgw". this broke the tests which expected radosgw to be available
if "tests" was built.

in this change, both "vstart" and "tests" now depend on "radosgwd"
instead of "radosgw".

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb22331d38e1b6ef100fe01de1064c934d834654..76a2be02ec9c0833e2a108105aeafce3056f9ee6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -767,8 +767,8 @@ if (WITH_CEPHFS)
   add_dependencies(vstart ceph-mds cephfs cython_cephfs)
 endif()
 if(WITH_RADOSGW)
-  add_dependencies(vstart radosgw radosgw-admin)
-endif(WITH_RADOSGW)
+  add_dependencies(vstart radosgwd radosgw-admin)
+endif()
 
 if(WITH_LTTNG)
   add_dependencies(vstart tracepoint_libraries)

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index b19c73da73902c466715efe50c269ea1b2fc1315..d3b0cf732a1c16060448d067db3e0cbd432e079d 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -523,8 +523,8 @@ if(WITH_RBD)
   endif(FREEBSD)
 endif(WITH_RBD)
 if(WITH_RADOSGW)
-  add_dependencies(tests radosgw radosgw-admin)
-endif(WITH_RADOSGW)
+  add_dependencies(tests radosgwd radosgw-admin)
+endif()
 #add dependency from fio just to ensure the plugin build isn't failing
 if(WITH_FIO OR WITH_SYSTEM_FIO)
   add_dependencies(tests fio_ceph_objectstore)