2

Author: HeartLinked

cmake_modules/IcebergThirdpartyToolchain.cmake

@@ -214,13 +214,111 @@ function(resolve_avro_dependency)
       PARENT_SCOPE)
 endfunction()
 
+# ----------------------------------------------------------------------
+# cURL (vendored if necessary for cpr)
+
+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_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.")
+    set(CURL_VENDORED TRUE)
+
+    # 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()
+  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)
+endfunction()
+
 # ----------------------------------------------------------------------
 # cpr (C++ Requests)
 
 function(resolve_cpr_dependency)
+  # First, ensure the curl dependency is resolved
+  resolve_curl_dependency()
+
   prepare_fetchcontent()
 
-  find_package(CURL QUIET)
+  # 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
@@ -235,36 +333,6 @@ function(resolve_cpr_dependency)
       ON
       CACHE BOOL "" FORCE)
 
-  if(CURL_FOUND)
-    message(STATUS "Found system curl: ${CURL_VERSION_STRING}. Configuring cpr to use it."
-    )
-    set(CPR_USE_SYSTEM_CURL
-        ON
-        CACHE BOOL "" FORCE)
-    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES CURL)
-  else()
-    message(STATUS "System curl not found. Vendoring curl for cpr.")
-    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-    set(CPR_USE_SYSTEM_CURL
-        OFF
-        CACHE BOOL "" FORCE)
-    set(CURL_DISABLE_INSTALL
-        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)
-  endif()
-
   fetchcontent_declare(cpr
                        ${FC_DECLARE_COMMON_OPTIONS}
                        GIT_REPOSITORY https://github.com/libcpr/cpr.git
@@ -273,6 +341,7 @@ function(resolve_cpr_dependency)
   fetchcontent_makeavailable(cpr)
 
   if(cpr_SOURCE_DIR)
+    set(CPR_VENDORED TRUE) # cpr itself is always vendored by our project
     set_target_properties(cpr PROPERTIES OUTPUT_NAME "iceberg_vendored_cpr"
                                          POSITION_INDEPENDENT_CODE ON)
 
@@ -281,24 +350,17 @@ function(resolve_cpr_dependency)
             RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
             ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
             LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
-
-    if(NOT CURL_FOUND AND TARGET libcurl_static)
-      set_target_properties(libcurl_static PROPERTIES EXPORT_NAME iceberg_libcurl_static)
-
-      install(TARGETS libcurl_static
-              EXPORT iceberg_targets
-              ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
-    endif()
-
-    set(CPR_VENDORED TRUE)
   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)