use SHARED_PRIVATE_LINK_LIBS

Author: HuaHuaY

src/iceberg/CMakeLists.txt

@@ -78,6 +78,7 @@ set(ICEBERG_SOURCES
 
 set(ICEBERG_STATIC_BUILD_INTERFACE_LIBS)
 set(ICEBERG_SHARED_BUILD_INTERFACE_LIBS)
+set(ICEBERG_SHARED_PRIVATE_BUILD_INTERFACE_LIBS)
 set(ICEBERG_STATIC_INSTALL_INTERFACE_LIBS)
 set(ICEBERG_SHARED_INSTALL_INTERFACE_LIBS)
 
@@ -88,9 +89,9 @@ list(APPEND
      roaring::roaring
      spdlog::spdlog
      ZLIB::ZLIB)
+list(APPEND ICEBERG_SHARED_BUILD_INTERFACE_LIBS nanoarrow::nanoarrow_shared)
 list(APPEND
-     ICEBERG_SHARED_BUILD_INTERFACE_LIBS
-     nanoarrow::nanoarrow_shared
+     ICEBERG_SHARED_PRIVATE_BUILD_INTERFACE_LIBS
      nlohmann_json::nlohmann_json
      roaring::roaring
      spdlog::spdlog
@@ -115,6 +116,8 @@ add_iceberg_lib(iceberg
                 ${ICEBERG_INCLUDES}
                 SHARED_LINK_LIBS
                 ${ICEBERG_SHARED_BUILD_INTERFACE_LIBS}
+                SHARED_PRIVATE_LINK_LIBS
+                ${ICEBERG_SHARED_PRIVATE_BUILD_INTERFACE_LIBS}
                 STATIC_LINK_LIBS
                 ${ICEBERG_STATIC_BUILD_INTERFACE_LIBS}
                 STATIC_INSTALL_INTERFACE_LIBS
@@ -149,24 +152,24 @@ if(ICEBERG_BUILD_BUNDLE)
   # Libraries to link with exported libiceberg_bundle.{so,a}.
   set(ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS)
   set(ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS)
+  set(ICEBERG_BUNDLE_SHARED_PRIVATE_BUILD_INTERFACE_LIBS)
   set(ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS)
   set(ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS)
 
   list(APPEND
        ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS
-       "$<IF:$<TARGET_EXISTS:iceberg_static>,iceberg_static,iceberg_shared>"
+       "iceberg_static"
        "$<IF:$<TARGET_EXISTS:Arrow::arrow_static>,Arrow::arrow_static,Arrow::arrow_shared>"
        "$<IF:$<TARGET_EXISTS:Parquet::parquet_static>,Parquet::parquet_static,Parquet::parquet_shared>"
        "$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_static>,avro-cpp::avrocpp_static,avro-cpp::avrocpp_shared>"
   )
+  list(APPEND ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS "iceberg_shared")
   list(APPEND
-       ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS
-       "$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>"
+       ICEBERG_BUNDLE_SHARED_PRIVATE_BUILD_INTERFACE_LIBS
        "$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>"
        "$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>"
        "$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>"
   )
-
   list(APPEND
        ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS
        "$<IF:$<TARGET_EXISTS:iceberg::iceberg_static>,iceberg::iceberg_static,iceberg::iceberg_shared>"
@@ -187,6 +190,8 @@ if(ICEBERG_BUILD_BUNDLE)
                   ${ICEBERG_BUNDLE_SOURCES}
                   SHARED_LINK_LIBS
                   ${ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS}
+                  SHARED_PRIVATE_LINK_LIBS
+                  ${ICEBERG_BUNDLE_SHARED_PRIVATE_BUILD_INTERFACE_LIBS}
                   STATIC_LINK_LIBS
                   ${ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS}
                   STATIC_INSTALL_INTERFACE_LIBS

src/iceberg/catalog/rest/CMakeLists.txt

@@ -19,13 +19,17 @@ set(ICEBERG_REST_SOURCES rest_catalog.cc json_internal.cc)
 
 set(ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS)
 set(ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS)
+set(ICEBERG_REST_SHARED_PRIVATE_BUILD_INTERFACE_LIBS)
 set(ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS)
 set(ICEBERG_REST_SHARED_INSTALL_INTERFACE_LIBS)
 
-list(APPEND ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS
-     "$<IF:$<TARGET_EXISTS:iceberg_static>,iceberg_static,iceberg_shared>" cpr::cpr)
-list(APPEND ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS
-     "$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>" cpr::cpr)
+list(APPEND ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS iceberg_static cpr::cpr)
+list(APPEND ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS iceberg_shared)
+list(APPEND
+     ICEBERG_REST_SHARED_PRIVATE_BUILD_INTERFACE_LIBS
+     iceberg_shared
+     cpr::cpr
+     nlohmann_json::nlohmann_json)
 list(APPEND
      ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS
      "$<IF:$<TARGET_EXISTS:iceberg::iceberg_static>,iceberg::iceberg_static,iceberg::iceberg_shared>"
@@ -40,6 +44,8 @@ add_iceberg_lib(iceberg_rest
                 ${ICEBERG_REST_SOURCES}
                 SHARED_LINK_LIBS
                 ${ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS}
+                SHARED_PRIVATE_LINK_LIBS
+                ${ICEBERG_REST_SHARED_PRIVATE_BUILD_INTERFACE_LIBS}
                 STATIC_LINK_LIBS
                 ${ICEBERG_REST_STATIC_BUILD_INTERFACE_LIBS}
                 STATIC_INSTALL_INTERFACE_LIBS

src/iceberg/catalog/rest/rest_catalog.h

@@ -30,6 +30,7 @@ class ICEBERG_REST_EXPORT RestCatalog {
   explicit RestCatalog(const std::string& base_url);
   ~RestCatalog() = default;
 
+  // TODO(zehua.zou): cpr should be wrapped.
   cpr::Response GetConfig();
 
   cpr::Response ListNamespaces();

src/iceberg/test/CMakeLists.txt

@@ -54,9 +54,13 @@ function(add_iceberg_test test_name)
 
   if("${ICEBERG_TEST_LINKAGE}" STREQUAL "shared")
     if(ARG_USE_BUNDLE)
-      target_link_libraries(${test_name} PRIVATE iceberg_bundle_shared)
+      target_link_libraries(${test_name}
+                            PRIVATE iceberg_bundle_shared
+                                    ${ICEBERG_BUNDLE_SHARED_PRIVATE_BUILD_INTERFACE_LIBS})
     else()
-      target_link_libraries(${test_name} PRIVATE iceberg_shared)
+      target_link_libraries(${test_name}
+                            PRIVATE iceberg_shared
+                                    ${ICEBERG_SHARED_PRIVATE_BUILD_INTERFACE_LIBS})
     endif()
   else()
     if(ARG_USE_BUNDLE)
@@ -184,7 +188,7 @@ if(ICEBERG_BUILD_REST)
     target_link_libraries(${test_name} PRIVATE GTest::gtest_main GTest::gmock)
 
     if("${ICEBERG_TEST_LINKAGE}" STREQUAL "shared")
-      target_link_libraries(${test_name} PRIVATE iceberg_rest_shared)
+      target_link_libraries(${test_name} PRIVATE iceberg_rest_shared cpr::cpr)
     else()
       target_link_libraries(${test_name} PRIVATE iceberg_rest_static)
     endif()