finish

Author: HeartLinked

cmake_modules/IcebergThirdpartyToolchain.cmake

@@ -445,13 +445,10 @@ function(resolve_curl_dependency)
   set(HTTP_ONLY ON)
   set(USE_LIBIDN2 OFF)
 
-  fetchcontent_declare(CURL
+  fetchcontent_declare(curl
                        ${FC_DECLARE_COMMON_OPTIONS}
-                       URL https://curl.se/download/curl-8.11.0.tar.gz
-                           FIND_PACKAGE_ARGS
-                           NAMES
-                           CURL
-                           CONFIG)
+                       URL https://curl.se/download/curl-8.11.0.tar.gz FIND_PACKAGE_ARGS
+                           NAMES curl)
 
   fetchcontent_makeavailable(CURL)
 

src/iceberg/CMakeLists.txt

@@ -137,23 +137,13 @@ if(ICEBERG_BUILD_BUNDLE)
        "$<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>"
   )
-  #   if(ICEBERG_BUILD_REST)
-  #     list(APPEND ICEBERG_BUNDLE_STATIC_BUILD_INTERFACE_LIBS
-  #          "$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>"
-  #          "$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>")
-  #   endif()
   list(APPEND
        ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS
        "$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>"
        "$<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>"
   )
-  #   if(ICEBERG_BUILD_REST)
-  #     list(APPEND ICEBERG_BUNDLE_SHARED_BUILD_INTERFACE_LIBS
-  #          "$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>"
-  #          "$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>")
-  #   endif()
 
   list(APPEND
        ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS
@@ -162,27 +152,13 @@ if(ICEBERG_BUILD_BUNDLE)
        "$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_static>,Parquet::parquet_static,Parquet::parquet_shared>>"
        "$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_static>,avro-cpp::avrocpp_static,avro-cpp::avrocpp_shared>>"
   )
-  #   if(ICEBERG_BUILD_REST)
-  #     list(APPEND
-  #          ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS
-  #          "$<IF:$<BOOL:${CURL_VENDORED}>,Iceberg::libcurl_static,$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>>"
-  #          "$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>>"
-  #     )
-  # endif()
   list(APPEND
        ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
        "$<IF:$<TARGET_EXISTS:Iceberg::iceberg_shared>,Iceberg::iceberg_shared,Iceberg::iceberg_static>"
        "$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>>"
        "$<IF:$<BOOL:${ARROW_VENDORED}>,Iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>>"
        "$<IF:$<BOOL:${AVRO_VENDORED}>,Iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>"
   )
-  #   if(ICEBERG_BUILD_REST)
-  #     list(APPEND
-  #          ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS
-  #          "$<IF:$<BOOL:${CURL_VENDORED}>,Iceberg::libcurl_static,$<IF:$<TARGET_EXISTS:CURL::libcurl>,CURL::libcurl,CURL::libcurl>>"
-  #          "$<IF:$<BOOL:${CPR_VENDORED}>,Iceberg::cpr,$<IF:$<TARGET_EXISTS:cpr::cpr>,cpr::cpr,cpr::cpr>>"
-  #     )
-  #   endif()
 
   add_iceberg_lib(iceberg_bundle
                   SOURCES