From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Tue, 12 Mar 2019 18:37:09 +0000 (+0100)
Subject: rgw: build async scheduler only when beast is built
X-Git-Tag: v14.2.1~85^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4e3129066b7eb17a94bd66b97263b330aef2ac87;p=ceph.git

rgw: build async scheduler only when beast is built

As it depends on yield and other asio constructs don't build if beast frontend
isn't built

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit a51f51215f6fcf99ab0ba620fcdc92fae1d02389)
---

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index ccc4f74cfe46..747bcedb0fa6 100644
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -45,9 +45,6 @@ set(librgw_common_srcs
   rgw_cors.cc
   rgw_cors_s3.cc
   rgw_dencoder.cc
-  rgw_dmclock_scheduler_ctx.cc
-  rgw_dmclock_sync_scheduler.cc
-  rgw_dmclock_async_scheduler.cc
   rgw_env.cc
   rgw_es_query.cc
   rgw_formats.cc
@@ -126,7 +123,6 @@ add_library(rgw_common OBJECT ${librgw_common_srcs})
 target_include_directories(rgw_common SYSTEM PUBLIC "services")
 target_include_directories(rgw_common PUBLIC "${CMAKE_SOURCE_DIR}/src/dmclock/support/src")
 
-
 if(WITH_LTTNG)
   # rgw/rgw_op.cc includes "tracing/rgw_op.h"
   # rgw/rgw_rados.cc includes "tracing/rgw_rados.h"
@@ -176,6 +172,7 @@ add_library(rgw_a STATIC
 
 add_dependencies(rgw_a civetweb_h)
 
+target_include_directories(rgw_a PUBLIC "${CMAKE_SOURCE_DIR}/src/dmclock/support/src")
 target_include_directories(rgw_a SYSTEM PUBLIC "../rapidjson/include")
 
 if(WITH_RADOSGW_AMQP_ENDPOINT)
@@ -183,7 +180,6 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
 endif()
 
 target_link_libraries(rgw_a
-  PUBLIC dmclock::dmclock
   PRIVATE
   librados cls_otp_client cls_lock_client cls_rgw_client cls_refcount_client
   cls_log_client cls_timeindex_client cls_version_client
@@ -212,7 +208,9 @@ set(radosgw_srcs
   rgw_loadgen_process.cc
   rgw_civetweb.cc
   rgw_civetweb_frontend.cc
-  rgw_civetweb_log.cc)
+  rgw_civetweb_log.cc
+  rgw_dmclock_scheduler_ctx.cc
+  rgw_dmclock_sync_scheduler.cc)
 
 if (WITH_RADOSGW_FCGI_FRONTEND)
   list(APPEND radosgw_srcs rgw_fcgi_process.cc)
@@ -221,7 +219,8 @@ endif()
 if(WITH_RADOSGW_BEAST_FRONTEND)
   list(APPEND radosgw_srcs
     rgw_asio_client.cc
-    rgw_asio_frontend.cc)
+    rgw_asio_frontend.cc
+    rgw_dmclock_async_scheduler.cc)
 endif()
 
 add_library(radosgw_a STATIC ${radosgw_srcs}
@@ -289,7 +288,6 @@ set(librgw_srcs
   rgw_file.cc)
 add_library(rgw SHARED ${librgw_srcs})
 target_link_libraries(rgw
-  PUBLIC dmclock::dmclock
   PRIVATE
   ${rgw_libs}
   librados
diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
index 9b2c6b63217d..60c4974e1b0d 100644
--- a/src/test/rgw/CMakeLists.txt
+++ b/src/test/rgw/CMakeLists.txt
@@ -140,7 +140,8 @@ add_ceph_unittest(unittest_rgw_string)
 # unitttest_rgw_dmclock_queue
 add_executable(unittest_rgw_dmclock_scheduler test_rgw_dmclock_scheduler.cc $<TARGET_OBJECTS:unit-main>)
 add_ceph_unittest(unittest_rgw_dmclock_scheduler)
-target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock)
+
+target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock ${Boost_LIBRARIES})
 if(WITH_BOOST_CONTEXT)
   target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
   target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)