@@ -15,14 +15,14 @@ jobs:
1515 fail-fast : false
1616 matrix :
1717 platform :
18- - { name: Windows (MSVC+CMake), os: windows-latest, shell: sh, cmake: '-GNinja', msvc: 1, shared: 1, static: 0 }
19- - { name: Windows (mingw32+autotools), os: windows-latest, shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686, shared: 1, static: 1 }
20- - { name: Windows (mingw64+CMake), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, cmake: '-G "Ninja Multi-Config"', shared: 1, static: 0 }
21- - { name: Linux (autotools), os: ubuntu-latest, shell: sh , shared: 1, static: 1 }
22- - { name: Linux (CMake), os: ubuntu-latest, shell: sh, cmake: '-GNinja', shared: 1, static: 0 }
23- - { name: 'Linux (CMake, static)', os: ubuntu-latest, shell: sh, cmake: '-DBUILD_SHARED_LIBS=OFF -GNinja', shared: 0, static: 1 }
24- - { name: macOS (autotools), os: macos-latest, shell: sh, shared: 1, static: 1 }
25- - { name: macOS (CMake), os: macos-latest, shell: sh, cmake: '-GNinja', shared: 1, static: 0 }
18+ - { name: Windows (MSVC+CMake), os: windows-latest, shell: sh, cmake: '-GNinja', msvc: 1 }
19+ - { name: Windows (mingw32+autotools), os: windows-latest, shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686 }
20+ - { name: Windows (mingw64+CMake), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, cmake: '-G "Ninja Multi-Config"' }
21+ - { name: Linux (autotools), os: ubuntu-latest, shell: sh }
22+ - { name: Linux (CMake), os: ubuntu-latest, shell: sh, cmake: '-GNinja' }
23+ - { name: 'Linux (CMake, static)', os: ubuntu-latest, shell: sh, cmake: '-DBUILD_SHARED_LIBS=OFF -GNinja' }
24+ - { name: macOS (autotools), os: macos-latest, shell: sh }
25+ - { name: macOS (CMake), os: macos-latest, shell: sh, cmake: '-GNinja' }
2626
2727 steps :
2828 - uses : actions/checkout@v4
@@ -146,8 +146,8 @@ jobs:
146146 cmake -S cmake/test -B cmake_install_config_build \
147147 -DCMAKE_BUILD_TYPE=Release \
148148 -DCMAKE_PREFIX_PATH="${{ env.SDL2_net_DIR }}" \
149- -DTEST_SHARED=${{ matrix.platform.shared }} \
150- -DTEST_STATIC=${{ matrix.platform.static }}
149+ -DTEST_SHARED=FALSE \
150+ -DTEST_STATIC=TRUE
151151 cmake --build cmake_install_config_build --config Release --verbose
152152
153153 - name : Verify CMake configuration files from the build directory
@@ -156,6 +156,6 @@ jobs:
156156 cmake -S cmake/test -B cmake_build_config_build \
157157 -DCMAKE_BUILD_TYPE=Release \
158158 -DCMAKE_PREFIX_PATH="$(pwd)/build-cmake" \
159- -DTEST_SHARED=${{ matrix.platform.shared }} \
160- -DTEST_STATIC=${{ matrix.platform.static }}
159+ -DTEST_SHARED=FALSE \
160+ -DTEST_STATIC=TRUE
161161 cmake --build cmake_build_config_build --config Release --verbose
0 commit comments