This is an automated email from the ASF dual-hosted git repository. fgerlits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit e92801c8afd4764e2080318fb8c9c1a5832b6d0c Author: Gabor Gyimesi <[email protected]> AuthorDate: Tue Sep 2 10:55:27 2025 +0200 MINIFICPP-2618 Fix build failure of zlib on MacOS runner - Upgrade zlib to v1.3.1 - Upgrade OpenCV to v4.12.0 - Remove unused variables Signed-off-by: Ferenc Gerlits <[email protected]> Closes #2018 --- cmake/BundledOpenCV.cmake | 4 ++-- cmake/BundledZLIB.cmake | 12 ++---------- cmake/zlib/dummy/FindZLIB.cmake | 4 ---- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/cmake/BundledOpenCV.cmake b/cmake/BundledOpenCV.cmake index 95384208b..1c2f35586 100644 --- a/cmake/BundledOpenCV.cmake +++ b/cmake/BundledOpenCV.cmake @@ -110,8 +110,8 @@ function(use_bundled_opencv SOURCE_DIR BINARY_DIR) # Build project ExternalProject_Add( opencv-external - URL "https://github.com/opencv/opencv/archive/refs/tags/4.7.0.tar.gz"; - URL_HASH "SHA256=8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973" + URL "https://github.com/opencv/opencv/archive/refs/tags/4.12.0.tar.gz"; + URL_HASH "SHA256=44c106d5bb47efec04e531fd93008b3fcd1d27138985c5baf4eafac0e1ec9e9d" SOURCE_DIR "${BINARY_DIR}/thirdparty/opencv-src" PATCH_COMMAND ${PC} CMAKE_ARGS ${OPENCV_CMAKE_ARGS} diff --git a/cmake/BundledZLIB.cmake b/cmake/BundledZLIB.cmake index 16b77c907..fd0a25a58 100644 --- a/cmake/BundledZLIB.cmake +++ b/cmake/BundledZLIB.cmake @@ -38,8 +38,8 @@ function(use_bundled_zlib SOURCE_DIR BINARY_DIR) # Build project ExternalProject_Add( zlib-external - URL "https://github.com/madler/zlib/archive/v1.2.11.tar.gz"; - URL_HASH "SHA256=629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff" + URL "https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz"; + URL_HASH "SHA256=17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c" SOURCE_DIR "${BINARY_DIR}/thirdparty/zlib-src" CMAKE_ARGS ${ZLIB_CMAKE_ARGS} BUILD_BYPRODUCTS "${BINARY_DIR}/thirdparty/zlib-install/${BYPRODUCT}" @@ -50,18 +50,10 @@ function(use_bundled_zlib SOURCE_DIR BINARY_DIR) set(ZLIB_FOUND "YES" CACHE STRING "" FORCE) set(ZLIB_INCLUDE_DIRS "${BINARY_DIR}/thirdparty/zlib-install/include" CACHE STRING "" FORCE) set(ZLIB_LIBRARIES "${BINARY_DIR}/thirdparty/zlib-install/${BYPRODUCT}" CACHE STRING "" FORCE) - set(ZLIB_VERSION_STRING "1.2.11" CACHE STRING "" FORCE) - set(ZLIB_VERSION_MAJOR 1 CACHE STRING "" FORCE) - set(ZLIB_VERSION_MINOR 2 CACHE STRING "" FORCE) - set(ZLIB_VERSION_PATCH 11 CACHE STRING "" FORCE) # Set exported variables for FindPackage.cmake set(PASSTHROUGH_VARIABLES ${PASSTHROUGH_VARIABLES} "-DEXPORTED_ZLIB_INCLUDE_DIRS=${ZLIB_INCLUDE_DIRS}" CACHE STRING "" FORCE) set(PASSTHROUGH_VARIABLES ${PASSTHROUGH_VARIABLES} "-DEXPORTED_ZLIB_LIBRARIES=${ZLIB_LIBRARIES}" CACHE STRING "" FORCE) - set(PASSTHROUGH_VARIABLES ${PASSTHROUGH_VARIABLES} "-DEXPORTED_ZLIB_VERSION_STRING=${ZLIB_VERSION_STRING}" CACHE STRING "" FORCE) - set(PASSTHROUGH_VARIABLES ${PASSTHROUGH_VARIABLES} "-DEXPORTED_ZLIB_VERSION_MAJOR=${ZLIB_VERSION_MAJOR}" CACHE STRING "" FORCE) - set(PASSTHROUGH_VARIABLES ${PASSTHROUGH_VARIABLES} "-DEXPORTED_ZLIB_VERSION_MINOR=${ZLIB_VERSION_MINOR}" CACHE STRING "" FORCE) - set(PASSTHROUGH_VARIABLES ${PASSTHROUGH_VARIABLES} "-DEXPORTED_ZLIB_VERSION_PATCH=${ZLIB_VERSION_PATCH}" CACHE STRING "" FORCE) # Create imported targets file(MAKE_DIRECTORY ${ZLIB_INCLUDE_DIRS}) diff --git a/cmake/zlib/dummy/FindZLIB.cmake b/cmake/zlib/dummy/FindZLIB.cmake index 4df824030..d959a5355 100644 --- a/cmake/zlib/dummy/FindZLIB.cmake +++ b/cmake/zlib/dummy/FindZLIB.cmake @@ -21,10 +21,6 @@ if(NOT ZLIB_FOUND) set(ZLIB_INCLUDE_DIR "${EXPORTED_ZLIB_INCLUDE_DIRS}" CACHE STRING "" FORCE) set(ZLIB_INCLUDE_DIRS "${EXPORTED_ZLIB_INCLUDE_DIRS}" CACHE STRING "" FORCE) set(ZLIB_LIBRARIES "${EXPORTED_ZLIB_LIBRARIES}" CACHE STRING "" FORCE) - set(ZLIB_VERSION_STRING "${EXPORTED_ZLIB_VERSION_STRING}" CACHE STRING "" FORCE) - set(ZLIB_VERSION_MAJOR "${EXPORTED_ZLIB_VERSION_MAJOR}" CACHE STRING "" FORCE) - set(ZLIB_VERSION_MINOR "${EXPORTED_ZLIB_VERSION_MINOR}" CACHE STRING "" FORCE) - set(ZLIB_VERSION_PATCH "${EXPORTED_ZLIB_VERSION_PATCH}" CACHE STRING "" FORCE) endif() if(NOT TARGET ZLIB::ZLIB)
