Skip to content

Commit d779291

Browse files
committed
fixup! Unified windows build
1 parent 9b3584a commit d779291

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/OCV-PR-Windows.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ jobs:
6565
-DCL_Z_OPTION=/Z7
6666
-DBUILD_EXAMPLES=ON
6767
-DOPENCV_ENABLE_NONFREE=ON
68+
${{ matrix.config == 'uwp' && -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 -DBUILD_opencv_gapi=OFF -DWITH_MSMF=OFF -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_opencv_apps=OFF }}
69+
${{ matrix.config == 'vulcan' && '-DWITH_OPENCL=OFF -DWITH_VULKAN=ON' }}
6870
MAIN_BUILD_DIR: "${{ (github.event.repository.name != 'opencv_contrib') && 'build' || 'build-contrib' }}"
6971
OPENCV_FOR_THREADS_NUM: 8
7072
CMAKE_BUILD_PARALLEL_LEVEL: 8

configure-and-build/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ runs:
2020
shell: bash
2121
run: |
2222
echo "::group::Configure"
23-
rm -rf ${{ inputs.builddir }}
24-
mkdir -p ${{ inputs.builddir }}
23+
rm -rf '${{ inputs.builddir }}'
24+
mkdir -p '${{ inputs.builddir }}'
2525
cmake \
2626
-S opencv \
27-
-B ${{ inputs.builddir }} \
28-
-G ${{ inputs.generator }} \
27+
-B '${{ inputs.builddir }}' \
28+
-G '${{ inputs.generator }}' \
2929
${{ inputs.options }}
3030
echo "::endgroup::"
3131
3232
- working-directory: ${{ inputs.workdir }}
3333
shell: bash
3434
run: |
3535
echo "::group::Build"
36-
cmake --build ${{ inputs.builddir }} 2>&1 | tee ${{ inputs.builddir }}/log.txt
36+
cmake --build '${{ inputs.builddir }}' 2>&1 | tee '${{ inputs.builddir }}/log.txt'
3737
echo "::endgroup::"
3838
3939
- shell: bash
4040
run: |
4141
set +e
4242
python3 ./scripts/warnings-handling.py \
43-
${{ inputs.workdir }}/${{ inputs.builddir }}/log.txt
43+
'${{ inputs.workdir }}/${{ inputs.builddir }}/log.txt'
4444
if [ $? -ne 0 ]; then
4545
echo "WARNINGS=1" >> $GITHUB_ENV
4646
fi

0 commit comments

Comments
 (0)