From: Kefu Chai <kchai@redhat.com>
Date: Thu, 9 Jan 2020 07:35:57 +0000 (+0800)
Subject: cmake: let vstart depend on radosgwd
X-Git-Tag: v15.1.0~287^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6cf778bad29eda592b4d47aa9820c375f5978ef;p=ceph.git

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 bb22331d38e1..76a2be02ec9c 100644
--- 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 b19c73da7390..d3b0cf732a1c 100644
--- 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)