From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 12 Apr 2018 15:00:15 +0000 (-0400)
Subject: rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF
X-Git-Tag: v13.1.0~166^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5c040d991510cb4ff0d74305889130e2d84fedc1;p=ceph-ci.git

rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF

Fixes: http://tracker.ceph.com/issues/23680

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

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 606bdcd72e2..cc2e19995b4 100644
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -163,9 +163,9 @@ if (WITH_RADOSGW_BEAST_FRONTEND)
   target_link_libraries(rgw_a Boost::coroutine Boost::context)
 endif()
 
-if (WITH_CURL_OPENSSL)
+if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL))
   target_link_libraries(rgw_a ${OPENSSL_LIBRARIES})
-endif (WITH_CURL_OPENSSL)
+endif()
 
 set(radosgw_srcs
   rgw_loadgen_process.cc
@@ -185,9 +185,7 @@ endif (WITH_RADOSGW_BEAST_FRONTEND)
 
 add_library(radosgw_a STATIC ${radosgw_srcs}
   $<TARGET_OBJECTS:civetweb_common_objs>)
-if (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL)
-  target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES})
-endif()
+target_link_libraries(radosgw_a rgw_a ${SSL_LIBRARIES})
 
 add_executable(radosgw rgw_main.cc)
 target_link_libraries(radosgw radosgw_a librados
@@ -203,10 +201,6 @@ add_dependencies(radosgw cls_rgw cls_lock cls_refcount
   cls_version cls_replica_log cls_user)
 install(TARGETS radosgw DESTINATION bin)
 
-if (WITH_RADOSGW_BEAST_FRONTEND)
-  target_link_libraries(radosgw_a ${OPENSSL_LIBRARIES})
-endif()
-
 set(radosgw_admin_srcs
   rgw_admin.cc
   rgw_orphan.cc)