cmake: move common_utf8 closer to where it is used

for example, json_spirit uses common_utf8, so link json_spirit against common_utf8.
because libcommon includes json_spirit, this change does not impact the
consumers of libcommon.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 45a27a872054544bae6447e894e6eabc8c47e11c..2e3ff71bdc62f10f1dd0999e31ec07929dbaa8cf 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -518,7 +518,7 @@ endif(HAVE_ARMV8_CRC)
 
 add_library(common_utf8 STATIC common/utf8.c)
 
-target_link_libraries(common json_spirit common_utf8 erasure_code rt uuid resolv ${CRYPTO_LIBS} ${Boost_LIBRARIES} ${BLKID_LIBRARIES} ${Backtrace_LIBRARIES})
+target_link_libraries(common json_spirit erasure_code rt uuid resolv ${CRYPTO_LIBS} ${Boost_LIBRARIES} ${BLKID_LIBRARIES} ${Backtrace_LIBRARIES})
 
 if(${WITH_LTTNG})
   add_subdirectory(tracing)

diff --git a/src/json_spirit/CMakeLists.txt b/src/json_spirit/CMakeLists.txt
index 75a734962dcc0764a114dfcc2ead444264640325..8abb56272426a8fad60649e8afdc52504da6408f 100644 (file)
--- a/src/json_spirit/CMakeLists.txt
+++ b/src/json_spirit/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_library(json_spirit STATIC
   json_spirit_reader.cpp
   json_spirit_writer.cpp)
-target_link_libraries(json_spirit ${Boost_LIBRARIES})
+target_link_libraries(json_spirit ${Boost_LIBRARIES} common_utf8)

diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
index 964880004a4ba10c428c8da975bfa7e6a5c2c533..dcb7a8c937d71c507f682a6f9a44ee668c74cc00 100644 (file)
--- a/src/rgw/CMakeLists.txt
+++ b/src/rgw/CMakeLists.txt
@@ -92,8 +92,8 @@ add_library(rgw_a STATIC ${rgw_a_srcs})
 target_include_directories(rgw_a PUBLIC ${FCGI_INCLUDE_DIR})
 target_link_libraries(rgw_a librados cls_rgw_client cls_refcount_client
   cls_log_client cls_statelog_client cls_timeindex_client cls_version_client
-  cls_replica_log_client cls_user_client curl global expat ${OPENLDAP_LIBRARIES}
-  ${CRYPTO_LIBS})
+  cls_replica_log_client cls_user_client common common_utf8 curl global expat
+  ${OPENLDAP_LIBRARIES} ${CRYPTO_LIBS})
 
 set(radosgw_srcs
   rgw_fcgi_process.cc