@@ -19,14 +19,17 @@ jobs:
19
19
- { name: 'windows: clang64', os: 'windows-latest', shell: 'msys2 {0}', msys2: true, msystem: 'clang64', msys-env: 'mingw-w64-clang-x86_64' }
20
20
- { name: 'windows: ucrt64', os: 'windows-latest', shell: 'msys2 {0}', msys2: true, msystem: 'ucrt64', msys-env: 'mingw-w64-ucrt-x86_64'}
21
21
- { name: 'windows: MSVC (vcvars)', os: 'windows-latest', shell: 'pwsh', msvc: true, msvc_arch: x64 }
22
- - { name: 'windows: MSVC (args)', os: 'windows-latest', shell: 'pwsh', msvc: false, cmake-arguments: '-A Win32'}
22
+ - { name: 'windows: MSVC (args)', os: 'windows-latest', shell: 'pwsh', msvc: false, msvc_arch: Win32 } # cmake-arguments: '-A Win32'}
23
23
- { name: 'linux: MinGW', os: 'ubuntu-latest', shell: 'bash', cmake-toolchain-file: 'cmake/mingw64.cmake', apt-packages: 'mingw-w64'}
24
24
- { name: 'macos: default', os: 'macos-latest', shell: 'sh', }
25
25
steps :
26
26
- uses : ilammy/msvc-dev-cmd@v1
27
27
if : ${{ matrix.platform.msvc }}
28
28
with :
29
29
arch : ${{ matrix.platform.msvc_arch }}
30
+ - name : Set up ninja
31
+ if : ${{ !matrix.platform.msystem }}
32
+ uses : ./.github/actions/setup-ninja
30
33
- name : Set up MSYS2
31
34
if : ${{ matrix.platform.msys2 }}
32
35
uses : msys2/setup-msys2@v2
@@ -56,11 +59,12 @@ jobs:
56
59
shell : ${{ matrix.platform.shell }}
57
60
cmake-arguments : ${{ matrix.platform.cmake-arguments }}
58
61
cmake-toolchain-file : ${{ matrix.platform.cmake-toolchain-file }}
62
+ cmake-generator : Ninja
59
63
install-linux-dependencies : true
60
64
sdl-test : true
61
65
- name : Configure (CMake)
62
66
run : |
63
- cmake -S . -B build ${{ matrix.platform.cmake-arguments }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.platform.cmake-toolchain-file }}
67
+ cmake -S . -B build -GNinja ${{ matrix.platform.cmake-arguments }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.platform.cmake-toolchain-file }}
64
68
- name : Build (CMake)
65
69
run : |
66
70
cmake --build build
0 commit comments