Merge pull request #1815 from shimat/pr/linuxarm-cmake-only

Extract linux-arm and CMake updates

Author: shimat

.github/workflows/linux-arm.yml

@@ -74,12 +74,11 @@ jobs:
       - name: Build OpenCV
         if: steps.opencv-cache.outputs.cache-hit != 'true'
         run: |
-          mkdir opencv/build && cd opencv/build
           cmake \
-            -S . \
-            -B build \
+            -S opencv \
+            -B opencv/build \
             -D CMAKE_BUILD_TYPE=Release \
-            -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
+            -D OPENCV_EXTRA_MODULES_PATH=${GITHUB_WORKSPACE}/opencv_contrib/modules \
             -D BUILD_SHARED_LIBS=OFF \
             -D ENABLE_CXX11=ON \
             -D BUILD_EXAMPLES=OFF \
@@ -115,20 +114,22 @@ jobs:
             -D WITH_GSTREAMER=OFF \
             -D WITH_ADE=OFF \
             -D OPENCV_ENABLE_NONFREE=ON \
-            -D CMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_artifacts ..
-          cmake --build build
-          cmake --install build
+            -D CMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/opencv_artifacts
+          cmake --build opencv/build -j 3
+          cmake --install opencv/build
           sudo ldconfig
-          cd ${GITHUB_WORKSPACE}
           ls
       
       - name: Build OpenCvSharpExtern
         run: |
-          mkdir opencvsharp/src/build && cd $_
-          cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts ..
-          make -j
-          ls OpenCvSharpExtern
-          cp OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/nuget/
+          cmake \
+            -S opencvsharp/src \
+            -B opencvsharp/src/build \
+            -D CMAKE_BUILD_TYPE=Release \
+            -D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts
+          cmake --build opencvsharp/src/build -j
+          ls opencvsharp/src/build/OpenCvSharpExtern
+          cp opencvsharp/src/build/OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/opencvsharp/nuget/
 
       - name: Check OpenCvSharpExtern
         run: |

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 
 project(OpenCvSharpExtern)
 

src/OpenCvSharpExtern/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.15)
 
 include_directories(${OpenCV_INCLUDE_DIR})
 IF(!EMSCRIPTEN)
@@ -11,16 +11,19 @@ ENDIF()
 
 file(GLOB OPENCVSHARP_FILES *.cpp)
 
+# Resolve Protobuf target before OpenCV config is loaded.
+if(APPLE)
+	find_package(Protobuf REQUIRED)
+endif()
+
 find_package(OpenCV REQUIRED)
 
 # iconv support isn't automatic on some systems
-if(CMAKE_VERSION VERSION_GREATER "3.11")
-  find_package(Iconv QUIET)
-  if(Iconv_FOUND)
-    ocv_target_link_libraries(${the_module} Iconv::Iconv)
-  else()
-    ocv_target_compile_definitions(${the_module} PRIVATE "NO_ICONV=1")
-  endif()
+find_package(Iconv QUIET)
+if(Iconv_FOUND)
+  ocv_target_link_libraries(${the_module} Iconv::Iconv)
+else()
+  ocv_target_compile_definitions(${the_module} PRIVATE "NO_ICONV=1")
 endif()
 
 if(OpenCV_FOUND)