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 d9205afdb5a99e9154b1037410f9783fd10700f2 Author: Martin Zink <[email protected]> AuthorDate: Wed Sep 10 14:47:40 2025 +0200 MINIFICPP-2628 CMake4 compatibility Signed-off-by: Ferenc Gerlits <[email protected]> Closes #2028 --- CMakeLists.txt | 2 ++ cmake/BundledOpenCV.cmake | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3945a88fd..e20b7b5a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ cmake_policy(SET CMP0135 NEW) # policy to set the timestamps of extracted conten project(nifi-minifi-cpp VERSION 0.99.2) set(PROJECT_NAME "nifi-minifi-cpp") +set(CMAKE_POLICY_VERSION_MINIMUM 3.5) if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE) @@ -195,6 +196,7 @@ set(PASSTHROUGH_CMAKE_ARGS -DANDROID_ABI=${ANDROID_ABI} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DANDROID_NDK=${ANDROID_NDK} -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} + -DCMAKE_POLICY_VERSION_MINIMUM=${CMAKE_POLICY_VERSION_MINIMUM} -DCMAKE_C_FLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} -DCMAKE_CXX_FLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} diff --git a/cmake/BundledOpenCV.cmake b/cmake/BundledOpenCV.cmake index 1c2f35586..4015453fc 100644 --- a/cmake/BundledOpenCV.cmake +++ b/cmake/BundledOpenCV.cmake @@ -98,6 +98,8 @@ function(use_bundled_opencv SOURCE_DIR BINARY_DIR) "-DWITH_TIFF=OFF" "-DWITH_CAROTENE=OFF" "-DWITH_PROTOBUF=OFF" + "-DWITH_AVIF=OFF" + "-DBUILD_ZLIB=OFF" ) append_third_party_passthrough_args(OPENCV_CMAKE_ARGS "${OPENCV_CMAKE_ARGS}")
