From 155cdbad4575c3cadcf365fa7def36c629d61ec6 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 10 Apr 2024 11:34:21 -0400 Subject: [PATCH] rgw/cmake: rgw_common links openssl unconditionally we had been relying on WITH_RADOSGW_AMQP_ENDPOINT for this dependency Signed-off-by: Casey Bodley --- src/rgw/CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 2c18ff1aadd..91c020a8a1e 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -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 -- 2.39.5