cmake: update for opencv

Author: naussika

SerialPrograms/CMakeLists.txt

@@ -347,12 +347,6 @@ else() # macOS and Linux
             target_include_directories(SerialProgramsLib PRIVATE ${HOMEBREW_PREFIX}/include/onnxruntime)
             target_link_libraries(SerialProgramsLib PRIVATE ${HOMEBREW_PREFIX}/lib/libonnxruntime.dylib)
         endif()
-        # Find OpenCV
-        if(CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(ARM64)")
-            find_package(OpenCV REQUIRED HINTS "/opt/homebrew/opt/opencv/lib/cmake/opencv4/")
-        else()
-            find_package(OpenCV REQUIRED HINTS "/usr/local/opt/opencv/lib/cmake/opencv4/")
-        endif()
 
     else() # Linux
         # ONNX RUNTIME LINUX CONFIG
@@ -431,13 +425,13 @@ else() # macOS and Linux
         else()
             message(FATAL_ERROR "Could not find ONNX Runtime headers or library.")
         endif()
-        # Find OpenCV
-        find_package(OpenCV REQUIRED HINTS "/usr/local/opt/opencv/lib/cmake/opencv4/")
     endif()
 
-    include_directories(${OpenCV_INCLUDE_DIRS})
-    link_directories(${OpenCV_LIBRARY_DIRS})
-    target_link_libraries(SerialProgramsLib PRIVATE ${OpenCV_LIBS})
+    # Find OpenCV
+    pkg_search_module(OpenCV REQUIRED opencv4 opencv)
+    target_include_directories(SerialProgramsLib PRIVATE ${OpenCV_INCLUDE_DIRS})
+    target_link_directories(SerialProgramsLib PUBLIC ${OpenCV_LIBRARY_DIRS})
+    target_link_libraries(SerialProgramsLib PUBLIC ${OpenCV_LINK_LIBRARIES})
 
     #we hope to use our own Tesseract build in future so we can rid that dependency
     #but right now to run on Linux and Mac we need to use external Tesseract library
@@ -466,11 +460,10 @@ else() # macOS and Linux
         # Add -Wno-c11-extensions to avoid clang gives
         # /usr/local/Cellar/opencv/4.5.5_3/include/opencv4/opencv2/core/mat.inl.hpp:2116:9: error: '_Atomic' is a C11 extension
         # when compiling OpenCV
-        # target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-c11-extensions)
-        target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32)
+        target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-c11-extensions -Wshorten-64-to-32)
     else()
         # Assume GCC
-        target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -fno-strict-aliasing)
+        target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-c11-extensions -fno-strict-aliasing)
     endif()
 
     # Set OS-specific flags