2

Author: HeartLinked

cmake_modules/IcebergThirdpartyToolchain.cmake

@@ -215,155 +215,104 @@ function(resolve_avro_dependency)
 endfunction()
 
 # ----------------------------------------------------------------------
-# cURL (vendored if necessary for cpr)
+# Curl
 
 function(resolve_curl_dependency)
   prepare_fetchcontent()
 
-  # Configuration for the vendored build case. These variables must be set
-  # before FetchContent_MakeAvailable is called.
-  set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Crucial for -fPIC on Linux
-  set(HTTP_ONLY
-      ON
-      CACHE BOOL "" FORCE)
   set(BUILD_CURL_EXE
       OFF
       CACHE BOOL "" FORCE)
   set(BUILD_TESTING
       OFF
       CACHE BOOL "" FORCE)
-  set(CURL_DISABLE_INSTALL
-      ON
-      CACHE BOOL "" FORCE)
-  set(CURL_USE_OPENSSL
-      ON
-      CACHE BOOL "" FORCE)
-  set(CURL_DISABLE_LDAP
-      ON
-      CACHE BOOL "" FORCE)
-  set(CURL_DISABLE_LDAPS
-      ON
-      CACHE BOOL "" FORCE)
-  set(USE_LIBIDN2
-      OFF
-      CACHE BOOL "" FORCE)
-  set(USE_IDN
-      OFF
-      CACHE BOOL "" FORCE)
 
-  # Using FIND_PACKAGE_ARGS, FetchContent will first try `find_package(CURL)`.
-  # If that fails, it will proceed to download and build from the URL.
-  if(APPLE)
-    # 在 macOS 上，我们不信任系统 curl，总是自己构建
-    # 所以我们不使用 FIND_PACKAGE_ARGS
-    fetchcontent_declare(curl
-                         ${FC_DECLARE_COMMON_OPTIONS}
-                         URL https://github.com/curl/curl/releases/download/curl-8_9_1/curl-8.9.1.tar.xz
-    )
-  else()
-    # 在其他系统上，继续使用 find-or-fetch 策略
-    fetchcontent_declare(curl
-                         ${FC_DECLARE_COMMON_OPTIONS}
-                         URL https://github.com/curl/curl/releases/download/curl-8_9_1/curl-8.9.1.tar.xz
-                             FIND_PACKAGE_ARGS
-                             NAMES
-                             CURL
-                             7.64.0
-                             CONFIG)
-  endif()
+  fetchcontent_declare(curl
+                       ${FC_DECLARE_COMMON_OPTIONS}
+                       GIT_REPOSITORY https://github.com/curl/curl.git
+                       GIT_TAG d755a5f7c009dd63a61b2c745180d8ba937cbfeb # Version 8.4.0
+                       FIND_PACKAGE_ARGS
+                       NAMES
+                       CURL
+                       8.4.0
+                       CONFIG)
 
   fetchcontent_makeavailable(curl)
 
-  # Check if FetchContent actually downloaded and built the dependency.
-  # The variable is <lowercase_name>_POPULATED.
-  if(curl_POPULATED)
-    message(STATUS "System curl not found. Using vendored curl.")
+  if(curl_SOURCE_DIR)
+    set(CURL_STATIC_LIBRARY_TARGET libcurl_static)
+
     set(CURL_VENDORED TRUE)
+    set_target_properties(${CURL_STATIC_LIBRARY_TARGET}
+                          PROPERTIES OUTPUT_NAME "iceberg_vendored_curl"
+                                     POSITION_INDEPENDENT_CODE ON)
 
-    # The curl CMake build creates the 'curl-library' target for the static library.
-    if(TARGET curl-library)
-      set_target_properties(curl-library
-                            PROPERTIES OUTPUT_NAME "iceberg_vendored_curl"
-                                       # Ensure PIC is set on the target itself for robustness
-                                       POSITION_INDEPENDENT_CODE ON)
-      install(TARGETS curl-library
-              EXPORT iceberg_targets
-              ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
-    endif()
+    install(TARGETS ${CURL_STATIC_LIBRARY_TARGET}
+            EXPORT iceberg_targets
+            ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
   else()
-    message(STATUS "Found and using system curl.")
     set(CURL_VENDORED FALSE)
     list(APPEND ICEBERG_SYSTEM_DEPENDENCIES CURL)
   endif()
 
-  set(CURL_VENDORED
-      ${CURL_VENDORED}
-      PARENT_SCOPE)
   set(ICEBERG_SYSTEM_DEPENDENCIES
       ${ICEBERG_SYSTEM_DEPENDENCIES}
       PARENT_SCOPE)
+  set(CURL_VENDORED
+      ${CURL_VENDORED}
+      PARENT_SCOPE)
 endfunction()
 
 # ----------------------------------------------------------------------
 # cpr (C++ Requests)
 
 function(resolve_cpr_dependency)
-  # First, ensure the curl dependency is resolved
-  resolve_curl_dependency()
-
   prepare_fetchcontent()
 
-  # Always tell cpr to find an external curl. Our resolve_curl_dependency()
-  # function has guaranteed that one is available, either from the system
-  # or by building it from source.
-  set(CPR_USE_SYSTEM_CURL
-      ON
-      CACHE BOOL "" FORCE)
-
   set(CPR_BUILD_TESTS
       OFF
       CACHE BOOL "" FORCE)
-  set(CPR_BUILD_STATIC
-      ON
-      CACHE BOOL "" FORCE)
-  set(CPR_FORCE_USE_PIC
-      ON
-      CACHE BOOL "" FORCE)
-  set(CPR_USE_SYSTEM_LIB_PSL
+  set(CPR_USE_SYSTEM_CURL
       ON
       CACHE BOOL "" FORCE)
 
   fetchcontent_declare(cpr
                        ${FC_DECLARE_COMMON_OPTIONS}
                        GIT_REPOSITORY https://github.com/libcpr/cpr.git
-                       GIT_TAG "1.11.0")
+                       GIT_TAG bb01c8db702fb41e5497aee9c0559ddf4bf13749 # Version 1.11.0
+                       FIND_PACKAGE_ARGS
+                       NAMES
+                       cpr
+                       CONFIG)
 
   fetchcontent_makeavailable(cpr)
 
   if(cpr_SOURCE_DIR)
-    set(CPR_VENDORED TRUE) # cpr itself is always vendored by our project
+
+    if(NOT TARGET cpr::cpr)
+      add_library(cpr::cpr ALIAS cpr)
+    endif()
+
+    set(CPR_VENDORED TRUE)
+
     set_target_properties(cpr PROPERTIES OUTPUT_NAME "iceberg_vendored_cpr"
                                          POSITION_INDEPENDENT_CODE ON)
-
     install(TARGETS cpr
             EXPORT iceberg_targets
             RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
             ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
             LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
   else()
-    # This branch is unlikely to be hit if the git repo is available,
-    # but is kept for completeness.
     set(CPR_VENDORED FALSE)
     list(APPEND ICEBERG_SYSTEM_DEPENDENCIES cpr)
   endif()
 
-  set(CPR_VENDORED
-      ${CPR_VENDORED}
-      PARENT_SCOPE)
-  # Propagate the system dependencies list, which was modified by resolve_curl_dependency
   set(ICEBERG_SYSTEM_DEPENDENCIES
       ${ICEBERG_SYSTEM_DEPENDENCIES}
       PARENT_SCOPE)
+  set(CPR_VENDORED
+      ${CPR_VENDORED}
+      PARENT_SCOPE)
 endfunction()
 
 # ----------------------------------------------------------------------
@@ -560,5 +509,6 @@ if(ICEBERG_BUILD_BUNDLE)
 endif()
 
 if(ICEBERG_BUILD_REST_CATALOG)
+  resolve_curl_dependency()
   resolve_cpr_dependency()
 endif()