]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF
authorCasey Bodley <cbodley@redhat.com>
Thu, 12 Apr 2018 15:00:15 +0000 (11:00 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 16 Oct 2018 15:40:53 +0000 (11:40 -0400)
Fixes: http://tracker.ceph.com/issues/23680
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 5c040d991510cb4ff0d74305889130e2d84fedc1)

src/rgw/CMakeLists.txt

index ff2d2d8a12045deb7b263c3b44c90b0eb95b9904..52e41976ec40a680505e3826e81e6924f2ae4f8c 100644 (file)
@@ -155,9 +155,9 @@ target_link_libraries(rgw_a librados cls_lock_client cls_rgw_client cls_refcount
   ${EXPAT_LIBRARIES}
   ${OPENLDAP_LIBRARIES} ${CRYPTO_LIBS})
 
-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