Update build matrix for Windows and macOS platforms

ak5k · Jan 3, 2024 · 5701eca · 5701eca
1 parent de747dc
commit 5701eca
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -29,8 +29,8 @@ jobs:
           - os: windows-latest
             arch: x64
             build_type: RelWithDebInfo
-          # - os: windows-latest
-          #   arch: x86
+          - os: windows-latest
+            arch: x86
           - os: macos-latest
             arch: arm64;x86_64
 
@@ -55,8 +55,10 @@ jobs:
       # Execute tests defined by the CMake configuration
       shell: cmd
       run: |
-        call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-        cmake -B ${{ github.workspace }} -G "Ninja" ^
+        if ${{matrix.arch}} == "x64" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
+        if ${{matrix.arch}} == "x86" call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat"
+        cmake -B ${{ github.workspace }} ^
+          -G "Ninja" ^
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^
           -DCMAKE_C_COMPILER=cl ^
           -DCMAKE_CXX_COMPILER=cl ^
@@ -68,7 +70,10 @@ jobs:
       # Note the current configuration is for a basic C++ project. You'll need to update this for your specific needs.
       if: runner.os != 'Windows'
       run: |
-        cmake -B ${{ github.workspace }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S ${{ github.workspace }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
+        cmake -B ${{ github.workspace }} \
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          -S ${{ github.workspace }} \
+          -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
         cmake --build ${{ github.workspace }} --config ${{ matrix.build_type }}
 
     # - name: Build