diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9cbc53c7..1bf80ab03 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,8 @@ jobs: else ./setup.sh fi + cmake_generator_linux32: Ninja + cmake_generator_win32: Ninja second_obc_user: name: 2nd obc user @@ -41,3 +43,5 @@ jobs: else ./setup.sh fi + cmake_generator_linux32: Ninja + cmake_generator_win32: Ninja diff --git a/.github/workflows/build_with_s2e.yml b/.github/workflows/build_with_s2e.yml index 63bc702b5..4970b5f41 100644 --- a/.github/workflows/build_with_s2e.yml +++ b/.github/workflows/build_with_s2e.yml @@ -95,5 +95,5 @@ jobs: run: | cl.exe cmake --version - cmake -G "Visual Studio 17 2022" -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=../s2e-core/ExtLibraries -DFLIGHT_SW_DIR=../c2a-core -DC2A_NAME=Examples/${{ matrix.example }} -DUSE_C2A=ON + cmake -A Win32 -DCMAKE_CONFIGURATION_TYPES:STRING="Debug" -DEXT_LIB_DIR=../s2e-core/ExtLibraries -DFLIGHT_SW_DIR=../c2a-core -DC2A_NAME=Examples/${{ matrix.example }} -DUSE_C2A=ON cmake --build . --clean-first diff --git a/Examples/minimum_user/CMakeSettings.json b/Examples/minimum_user/CMakeSettings.json index 18553a424..4012b171c 100644 --- a/Examples/minimum_user/CMakeSettings.json +++ b/Examples/minimum_user/CMakeSettings.json @@ -2,7 +2,7 @@ "configurations": [ { "name": "Win32", - "generator": "Visual Studio 16 2019", + "generator": "Ninja", "configurationType": "Debug", "inheritEnvironments": [ "msvc_x86"