This is an automated email from the ASF dual-hosted git repository. martinzink pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 961f352f0366e7b69d5a97f57baf49e2904f353e Author: Marton Szasz <[email protected]> AuthorDate: Wed Feb 18 12:49:34 2026 +0100 MINIFICPP-2713 curl: upgrade to 8.18.0 Closes #2100 Signed-off-by: Martin Zink <[email protected]> --- cmake/BundledLibcURL.cmake | 8 ++++++-- thirdparty/curl/module-path.patch | 17 ++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/cmake/BundledLibcURL.cmake b/cmake/BundledLibcURL.cmake index ffcdeebc4..fa2b6b565 100644 --- a/cmake/BundledLibcURL.cmake +++ b/cmake/BundledLibcURL.cmake @@ -52,6 +52,8 @@ function(use_bundled_curl SOURCE_DIR BINARY_DIR) -DCURL_USE_LIBPSL=OFF -DCURL_USE_OPENSSL=ON -DUSE_NGHTTP2=OFF + -DCURL_ZSTD=OFF + -DCURL_BROTLI=OFF ) append_third_party_passthrough_args(CURL_CMAKE_ARGS "${CURL_CMAKE_ARGS}") @@ -59,8 +61,8 @@ function(use_bundled_curl SOURCE_DIR BINARY_DIR) # Build project ExternalProject_Add( curl-external - URL "https://github.com/curl/curl/releases/download/curl-8_11_1/curl-8.11.1.tar.gz"; - URL_HASH "SHA256=a889ac9dbba3644271bd9d1302b5c22a088893719b72be3487bc3d401e5c4e80" + URL "https://github.com/curl/curl/releases/download/curl-8_18_0/curl-8.18.0.tar.gz"; + URL_HASH "SHA256=e9274a5f8ab5271c0e0e6762d2fce194d5f98acc568e4ce816845b2dcc0cf88f" SOURCE_DIR "${BINARY_DIR}/thirdparty/curl-src" LIST_SEPARATOR % # This is needed for passing semicolon-separated lists CMAKE_ARGS ${CURL_CMAKE_ARGS} @@ -98,5 +100,7 @@ function(use_bundled_curl SOURCE_DIR BINARY_DIR) target_link_libraries(CURL::libcurl INTERFACE "-framework CoreFoundation") target_link_libraries(CURL::libcurl INTERFACE "-framework SystemConfiguration") target_link_libraries(CURL::libcurl INTERFACE "-framework CoreServices") + elseif (WIN32) + target_link_libraries(CURL::libcurl INTERFACE Iphlpapi.lib) endif() endfunction(use_bundled_curl SOURCE_DIR BINARY_DIR) diff --git a/thirdparty/curl/module-path.patch b/thirdparty/curl/module-path.patch index 90b3a2dbe..f141cc38f 100644 --- a/thirdparty/curl/module-path.patch +++ b/thirdparty/curl/module-path.patch @@ -1,12 +1,11 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a0fe76c24..e12b81b91 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,7 +63,7 @@ - - cmake_minimum_required(VERSION 3.7...3.16 FATAL_ERROR) - --set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}") +diff -rupN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2026-01-07 07:57:50.000000000 +0100 ++++ b/CMakeLists.txt 2026-02-06 16:52:59.927109936 +0100 +@@ -45,7 +45,7 @@ if(NOT "$ENV{CURL_BUILDINFO}$ENV{CURL_CI + endforeach() + endif() + +-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake") include(Utilities) include(Macros)
