fix

rainyl · Sep 24, 2024 · e205f3c · e205f3c
1 parent 4d616aa
commit e205f3c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -47,8 +47,8 @@ jobs:
           echo "$GITHUB_ENV"
           cd ${{ env.SOURCE_DIR }}
           mkdir build && cd build
-          cmake ${{ env.COMMON_CMAKE_OPTIONS }} -S .. \
-            `cat ${{ github.workspace }}/options.txt` \
+          cmake `cat ${{ github.workspace }}/options.txt` \
+            ${{ env.COMMON_CMAKE_OPTIONS }} -S .. \
             -DFFMPEG_DIR="${{ env.FFMPEG_ROOT }}/cmake" \
             -DFFMPEG_ARCH="${{ matrix.abi }}"
           cmake --build . -j $(nproc)

diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml
@@ -35,6 +35,7 @@ jobs:
         -DBUILD_OPENJPEG=OFF \
         -DWITH_OPENCL=OFF \
         -DWITH_OPENCL_SVM=OFF \
+        -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
     steps:
       - uses: actions/checkout@v4
       - name: setup-opencv-source
@@ -56,8 +57,8 @@ jobs:
         run: |
           cd ${{ env.SOURCE_DIR }}
           mkdir build && cd build
-          cmake ${{ env.COMMON_CMAKE_OPTIONS }}  -S .. \
-            `cat ../../options.txt` \
+          cmake `cat ${{ github.workspace }}/options.txt` \
+            ${{ env.COMMON_CMAKE_OPTIONS }} -S .. \
             -DPLATFORM=OS64 \
             -DFFMPEG_DIR="${{ env.FFMPEG_ROOT }}/cmake"
           cmake --build . -j 4
@@ -114,6 +115,7 @@ jobs:
         -DBUILD_OPENJPEG=OFF \
         -DWITH_OPENCL=OFF \
         -DWITH_OPENCL_SVM=OFF \
+        -DCMAKE_POLICY_DEFAULT_CMP0074=NEW \
     steps:
       - uses: actions/checkout@v4
       - name: setup-opencv-source
@@ -135,8 +137,8 @@ jobs:
         run: |
           cd ${{ env.SOURCE_DIR }}
           mkdir build && cd build
-          cmake ${{ env.COMMON_CMAKE_OPTIONS }}  -S .. \
-            `cat ../../options.txt` \
+          cmake `cat ${{ github.workspace }}/options.txt` \
+            ${{ env.COMMON_CMAKE_OPTIONS }} -S .. \
             -DPLATFORM=${{ matrix.platform.name }} \
             -DFFMPEG_DIR="${{ env.FFMPEG_ROOT }}/cmake" \
             -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON
@@ -212,9 +214,9 @@ jobs:
         run: |
           cd ${{ env.SOURCE_DIR }}
           mkdir build && cd build
-          cmake ${{ env.COMMON_CMAKE_OPTIONS }} -S .. \
+          cmake `cat ${{ github.workspace }}/options.txt` \
+            ${{ env.COMMON_CMAKE_OPTIONS }} -S .. \
             -DPLATFORM=${{ matrix.osname.platform }} \
-            `cat ../../options.txt` \
             -DFFMPEG_DIR="${{ env.FFMPEG_ROOT }}/cmake"
           cmake --build . -j 4
           cmake --build . --target install

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -60,9 +60,9 @@ jobs:
         run: |
           cd ${{ env.SOURCE_DIR }}
           mkdir build && cd build
-          cmake ${{ env.COMMON_CMAKE_OPTIONS }} -S .. \
+          cmake `cat ${{ github.workspace }}/options.txt` \
+            ${{ env.COMMON_CMAKE_OPTIONS }} -S .. \
             ${{ env.TOOLCHAIN_FILE }} \
-            `cat ${{ github.workspace }}/options.txt` \
             -DFFMPEG_DIR="${{ env.FFMPEG_ROOT }}/cmake" \
             -DFFMPEG_ARCH=${{ matrix.os.ffmpeg_arch }}
           cmake --build . -j $(nproc)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -24,14 +24,14 @@ jobs:
     env:
       UseMultiToolTask: true
       COMMON_CMAKE_OPTIONS: |
+        $(type ${{ github.workspace }}/options.txt) `
         -T ${{ matrix.os.toolset-version }},host=x64 `
         -DCMAKE_INSTALL_PREFIX=install `
         -DOPENCV_EXTRA_MODULES_PATH="${{ github.workspace }}/opencv_contrib/modules" `
         -DCMAKE_POLICY_DEFAULT_CMP0074=NEW `
         -A ${{ matrix.os.arch }} `
         -DCMAKE_SYSTEM_NAME=Windows `
         -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.os.arch }} `
-        $(type ${{ github.workspace }}/options.txt) `
         -DFFMPEG_ARCH=${{ matrix.os.arch }} `
     steps:
       - uses: actions/checkout@v4