Fix windows builds

Author: florianbecker

.github/workflows/integrate.yml

@@ -66,15 +66,20 @@ jobs:
             compiler: clang
             version: "11"
 
-          - name: windows-2016-msvc2017
-            os: windows-2016
+          - name: windows-2019-msvc2015
+            os: windows-2019
+            compiler: cl
+            version: "Visual Studio 14 2015 x64"
+
+          - name: windows-2019-msvc2017
+            os: windows-2019
             compiler: cl
-            version: "2017"
+            version: "Visual Studio 15 2017 x64"
 
           - name: windows-2019-msvc2019
             os: windows-2019
             compiler: cl
-            version: "2019"
+            version: "Visual Studio 16 2019"
 
           - name: macOS-10.15-xcode-11
             os: macOS-10.15
@@ -135,18 +140,9 @@ jobs:
               echo "CXX=clang++" >> $GITHUB_ENV
             fi
 
-      - name: Add msbuild to PATH
-        if: runner.os == 'Windows'
-        uses: microsoft/[email protected]
-
-#      - name: MSBuild (Windows)
-#        if: runner.os == 'Windows'
-#        run: cmd.exe \c "C:/Program Files (x86)/Microsoft Visual Studio/${{matrix.version}}/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
-
       - name: Dependencies (Windows)
         if: runner.os == 'Windows'
         run: |
-            choco install ninja --global
             if ( "${{matrix.compiler}}" -eq "gcc" ) {
               choco install gcc --global
               echo "CC=gcc" >> $Env:GITHUB_ENV
@@ -169,7 +165,7 @@ jobs:
       - name: Configure CMake (Windows)
         if: runner.os == 'Windows'
         working-directory: ${{runner.workspace}}/build
-        run: cmake $Env:GITHUB_WORKSPACE -G"Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=${{matrix.config}}
+        run: cmake $Env:GITHUB_WORKSPACE -G"${{matrix.version}}" -DCMAKE_BUILD_TYPE=${{matrix.config}}
 
       - name: Build
         working-directory: ${{runner.workspace}}/build