Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reenable cmake install step for Windows builds

Browse Source 
Just skip using sudo under this OS, but still run "cmake install" as
this is required for the final test, checking the installation success,
to work.
This commit is contained in:
Vadim Zeitlin
2021-12-10 18:00:38 +01:00
parent d1b5fd27aa
commit ddde0f1eea
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/ci_cmake.yml vendored
View File

@@ -65,6 +65,7 @@ jobs:
cmake_tests: OFF cmake_tests: OFF
- name: Windows MSVC - name: Windows MSVC
runner: windows-latest runner: windows-latest
no_sudo: 1
cmake_defines: -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe cmake_defines: -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe
cmake_generator: Ninja cmake_generator: Ninja
cmake_samples: SOME cmake_samples: SOME
@@ -129,10 +130,13 @@ jobs:
cmake --build . -- $wxBUILD_ARGS cmake --build . -- $wxBUILD_ARGS
- name: Installing - name: Installing
if: runner.os != 'Windows'
working-directory: build_cmake working-directory: build_cmake
run: | run: |
sudo cmake --build . --target install if [ -z "${{ matrix.no_sudo }}" ]; then
sudo cmake --build . --target install
else
cmake --build . --target install
fi
- name: Testing - name: Testing
if: matrix.cmake_tests != 'OFF' if: matrix.cmake_tests != 'OFF'