test

Author: wgtmac

cmake_modules/IcebergThirdpartyToolchain.cmake

@@ -430,66 +430,6 @@ function(resolve_zlib_dependency)
 
 endfunction()
 
-# ----------------------------------------------------------------------
-# CURL (for cpr)
-
-function(resolve_curl_dependency)
-  prepare_fetchcontent()
-
-  set(BUILD_CURL_EXE OFF)
-  set(BUILD_SHARED_LIBS OFF)
-  set(BUILD_TESTING OFF)
-  set(CURL_CA_BUNDLE "auto")
-  set(CURL_ENABLE_EXPORT_TARGET OFF)
-  set(CURL_STATICLIB ON)
-  set(HTTP_ONLY ON)
-  set(USE_LIBIDN2 OFF)
-
-  fetchcontent_declare(curl
-                       ${FC_DECLARE_COMMON_OPTIONS}
-                       URL https://curl.se/download/curl-8.11.0.tar.gz FIND_PACKAGE_ARGS
-                           NAMES curl)
-
-  fetchcontent_makeavailable(CURL)
-
-  if(curl_SOURCE_DIR)
-    set(CURL_VERSION_STRING
-        "8.11.0"
-        PARENT_SCOPE)
-    if(NOT TARGET CURL::libcurl)
-      add_library(CURL::libcurl INTERFACE IMPORTED)
-      target_link_libraries(CURL::libcurl INTERFACE libcurl_static)
-      target_include_directories(CURL::libcurl INTERFACE ${curl_BINARY_DIR}/include
-                                                         ${curl_SOURCE_DIR}/include)
-    endif()
-
-    set(CURL_VENDORED TRUE)
-    set_target_properties(libcurl_static PROPERTIES OUTPUT_NAME "iceberg_vendored_curl"
-                                                    POSITION_INDEPENDENT_CODE ON)
-    add_library(Iceberg::libcurl_static ALIAS libcurl_static)
-    install(TARGETS libcurl_static
-            EXPORT iceberg_targets
-            RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
-            ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
-            LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
-    message(STATUS "Use vendored CURL")
-
-    # curl depends on the system installed OpenSSL
-    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL)
-  else()
-    set(CURL_VENDORED FALSE)
-    list(APPEND ICEBERG_SYSTEM_DEPENDENCIES CURL)
-    message(STATUS "Use system CURL")
-  endif()
-
-  set(ICEBERG_SYSTEM_DEPENDENCIES
-      ${ICEBERG_SYSTEM_DEPENDENCIES}
-      PARENT_SCOPE)
-  set(CURL_VENDORED
-      ${CURL_VENDORED}
-      PARENT_SCOPE)
-endfunction()
-
 # ----------------------------------------------------------------------
 # cpr (C++ Requests)
 
@@ -498,9 +438,11 @@ function(resolve_cpr_dependency)
 
   set(CPR_BUILD_TESTS OFF)
   set(CPR_BUILD_TESTS_SSL OFF)
+  set(CPR_ENABLE_CURL_HTTP_ONLY ON)
   set(CPR_ENABLE_SSL ON)
   set(CPR_USE_SYSTEM_CURL ON)
-  set(CPR_CURL_NOSIGNAL ON)
+
+  message(STATUS "* * * resolve_cpr_dependency * * *")
 
   fetchcontent_declare(cpr
                        ${FC_DECLARE_COMMON_OPTIONS}
@@ -569,6 +511,5 @@ if(ICEBERG_BUILD_BUNDLE)
 endif()
 
 if(ICEBERG_BUILD_REST)
-  resolve_curl_dependency()
   resolve_cpr_dependency()
 endif()

src/iceberg/IcebergConfig.cmake.in

@@ -79,6 +79,10 @@ if(NOT TARGET roaring::roaring-headers-cpp)
   add_library(roaring::roaring-headers-cpp INTERFACE IMPORTED)
 endif()
 
+if(NOT TARGET CURL::libcurl)
+  add_library(CURL::libcurl INTERFACE IMPORTED)
+endif()
+
 include("${CMAKE_CURRENT_LIST_DIR}/IcebergTargets.cmake")
 
 if(TARGET Iceberg::arrow_static)