(nifi-minifi-cpp) 01/03: MINIFICPP-2260 Fix OpenCV extension build failure on macOS

[fgerlits]

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 470c266fd8f3f5971defed1d2b42e654c16e8d38
Author: Martin Zink <martinz...@apache.org>
AuthorDate: Fri Oct 27 15:18:48 2023 +0200

    MINIFICPP-2260 Fix OpenCV extension build failure on macOS
    
    also:
    - link openCV required libs in BundledOpenCV.cmake instead of 
opencv/CMakeLists.txt
    - replace lapack and blas with "-framework Accelerate"
    
    Signed-off-by: Ferenc Gerlits <fgerl...@gmail.com>
    This closes #1694
---
 .github/workflows/ci.yml  | 2 +-
 cmake/BundledOpenCV.cmake | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c10e7083..f1702c860 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
           export LDFLAGS="-L/usr/local/opt/flex/lib"
           export CPPFLAGS="-I/usr/local/opt/flex/include"
           # CPPFLAGS are not recognized by cmake, so we have to force them to 
CFLAGS and CXXFLAGS to have flex 2.6 working
-          ./bootstrap.sh -e -t && cd build  && cmake -G Ninja 
-DCMAKE_BUILD_TYPE=Release -DCI_BUILD=ON -DCMAKE_C_FLAGS="${CPPFLAGS} 
${CFLAGS}" -DCMAKE_CXX_FLAGS="${CPPFLAGS} ${CXXFLAGS}" 
-DENABLE_PYTHON_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_SQL=ON 
-DUSE_REAL_ODBC_TEST_DRIVER=ON -DENABLE_AZURE=ON -DENABLE_GCP=ON 
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES=OFF -DSTRICT_GSL_CHECKS=AUDIT 
-DFAIL_ON_WARNINGS=ON .. && cmake --build . --parallel 4
+          ./bootstrap.sh -e -t && cd build  && cmake -G Ninja 
-DCMAKE_BUILD_TYPE=Release -DCI_BUILD=ON -DCMAKE_C_FLAGS="${CPPFLAGS} 
${CFLAGS}" -DCMAKE_CXX_FLAGS="${CPPFLAGS} ${CXXFLAGS}" 
-DENABLE_PYTHON_SCRIPTING=ON -DENABLE_LUA_SCRIPTING=ON -DENABLE_SQL=ON 
-DUSE_REAL_ODBC_TEST_DRIVER=ON -DENABLE_AZURE=ON -DENABLE_GCP=ON 
-DENABLE_OPENCV=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES=OFF 
-DSTRICT_GSL_CHECKS=AUDIT -DFAIL_ON_WARNINGS=ON .. && cmake --build . 
--parallel 4
       - name: cache save
         uses: actions/cache/save@v3
         if: always()
diff --git a/cmake/BundledOpenCV.cmake b/cmake/BundledOpenCV.cmake
index ccd18ae23..7e793950f 100644
--- a/cmake/BundledOpenCV.cmake
+++ b/cmake/BundledOpenCV.cmake
@@ -210,5 +210,7 @@ function(use_bundled_opencv SOURCE_DIR BINARY_DIR)
 
     add_library(OPENCV::libopencv INTERFACE IMPORTED)
     target_link_libraries(OPENCV::libopencv INTERFACE OPENCV::libopencv-flann 
OPENCV::libopencv-dnn OPENCV::libopencv-objdetect OPENCV::libopencv-core 
OPENCV::libopencv-gapi OPENCV::libopencv-imgcodecs OPENCV::libopencv-calib3d 
OPENCV::libopencv-imgproc OPENCV::libopencv-photo OPENCV::libopencv-videoio 
OPENCV::libopencv-video OPENCV::libopencv-stitching 
OPENCV::libopencv-features2d)
-
+    if (APPLE)
+        target_link_libraries(OPENCV::libopencv INTERFACE "-framework 
AVFoundation" "-framework CoreFoundation" "-framework CoreGraphics" "-framework 
CoreMedia" "-framework CoreVideo" "-framework Foundation" "-framework OpenCL" 
"-framework Accelerate")
+    endif()
 endfunction(use_bundled_opencv)