cmake: move rgw_lua_request.cc from rgw_common target to rgw_a

resolves a clang linker error where `rgw::lua::request::RequestLog()`
from rgw_lua_request.cc (in rgw_common) looks for `rgw_log_op()` from
rgw_log.cc (in rgw_a)

rgw_a depends on rgw_common, not the other way around. so this moves
rgw_lua_request.cc into the same target as rgw_log.cc

lua is now a public dependency of rgw_common so it's not hidden from
rgw_a or unit tests

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

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index b5ab1b83486046606f2c9b462a669662988989a5..5232108cfe50ef9cbd7ea377843edc5d94c04587 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -161,7 +161,6 @@ set(librgw_common_srcs
   cls_fifo_legacy.cc
   rgw_lua_utils.cc
   rgw_lua.cc
-  rgw_lua_request.cc
   rgw_bucket_encryption.cc
   rgw_tracer.cc)
 
@@ -214,14 +213,14 @@ target_link_libraries(rgw_common
     dmclock::dmclock
     ${CURL_LIBRARIES}
     ${EXPAT_LIBRARIES}
-    ${LUA_LIBRARIES}
     ${ARROW_LIBRARIES}
   PUBLIC
+    ${LUA_LIBRARIES}
     spawn)
 target_include_directories(rgw_common
   PUBLIC "services"
   PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw"
-  PRIVATE "${LUA_INCLUDE_DIR}")
+  PUBLIC "${LUA_INCLUDE_DIR}")
 if(WITH_RADOSGW_KAFKA_ENDPOINT)
   # used by rgw_kafka.cc
   target_link_libraries(rgw_common
@@ -275,6 +274,7 @@ set(rgw_a_srcs
   rgw_http_client_curl.cc
   rgw_loadgen.cc
   rgw_log.cc
+  rgw_lua_request.cc
   rgw_period_pusher.cc
   rgw_realm_reloader.cc
   rgw_realm_watcher.cc
@@ -322,7 +322,6 @@ target_link_libraries(rgw_a
   PRIVATE
     common_utf8 global
     ${CRYPTO_LIBS}
-    ${LUA_LIBRARIES}
     ${ARROW_LIBRARIES}
     OATH::OATH
   PUBLIC
@@ -336,8 +335,6 @@ endif()
 
 set(rgw_libs rgw_a)
 
-list(APPEND rgw_libs ${LUA_LIBRARIES})
-
 set(rgw_schedulers_srcs
   rgw_dmclock_scheduler_ctx.cc
   rgw_dmclock_sync_scheduler.cc
@@ -463,8 +460,6 @@ if(WITH_RADOSGW_KAFKA_ENDPOINT)
   target_link_libraries(rgw PRIVATE RDKafka::RDKafka)
 endif()
 
-target_link_libraries(rgw PRIVATE ${LUA_LIBRARIES})
-
 set_target_properties(rgw PROPERTIES OUTPUT_NAME rgw VERSION 2.0.0
   SOVERSION 2)
 install(TARGETS rgw DESTINATION ${CMAKE_INSTALL_LIBDIR})

diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
index 2df70d88e2ef1b86470b6cb2a25b4633199c391d..e8eed91b7878163a423450fa8c47b0172f91c87e 100644 (file)
--- a/src/test/rgw/CMakeLists.txt
+++ b/src/test/rgw/CMakeLists.txt
@@ -227,5 +227,5 @@ target_link_libraries(unittest_log_backing radostest-cxx ${UNITTEST_LIBS}
 
 add_executable(unittest_rgw_lua test_rgw_lua.cc)
 add_ceph_unittest(unittest_rgw_lua)
-target_link_libraries(unittest_rgw_lua ${rgw_libs} ${LUA_LIBRARIES})
+target_link_libraries(unittest_rgw_lua ${rgw_libs})