]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/cmake: rgw_common links openssl unconditionally
authorCasey Bodley <cbodley@redhat.com>
Wed, 10 Apr 2024 15:34:21 +0000 (11:34 -0400)
committerCasey Bodley <cbodley@redhat.com>
Wed, 10 Apr 2024 16:53:04 +0000 (12:53 -0400)
we had been relying on WITH_RADOSGW_AMQP_ENDPOINT for this dependency

Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/CMakeLists.txt

index 2c18ff1aadd3f11312c317e3784a357223de7133..91c020a8a1e34a38d487c796336b1d2d4a7c837b 100644 (file)
@@ -290,7 +290,8 @@ target_link_libraries(rgw_common
     ${LUA_LIBRARIES}
     RapidJSON::RapidJSON
     spawn
-    ${FMT_LIB})
+    ${FMT_LIB}
+    OpenSSL::SSL)
 target_include_directories(rgw_common
   PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw/services"
   PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw"
@@ -310,8 +311,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
   # used by rgw_amqp.cc
   target_link_libraries(rgw_common
     PRIVATE
-      RabbitMQ::RabbitMQ
-      OpenSSL::SSL)
+      RabbitMQ::RabbitMQ)
 endif()
 if(WITH_OPENLDAP)
   target_link_libraries(rgw_common
@@ -467,10 +467,6 @@ target_link_libraries(radosgw PRIVATE
   kmip
   ${ALLOC_LIBS})
 
-if(WITH_RADOSGW_BEAST_OPENSSL)
-  # used by rgw_asio_frontend.cc
-  target_link_libraries(radosgw PRIVATE OpenSSL::SSL)
-endif()
 install(TARGETS radosgw DESTINATION bin)
 
 set(radosgw_admin_srcs