try to fix VC version

orthanc-server · Mar 25, 2024 · ba60dd3 · ba60dd3
1 parent f83171c
commit ba60dd3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/build-win-binaries.yml b/.github/workflows/build-win-binaries.yml
@@ -56,6 +56,17 @@ jobs:
       run: |
         bash -c "ls -al /c/hostedtoolcache/windows/Python/"
 
+
+    # By default Visual Studio chooses the earliest installed toolset version
+    # for the main build and vcpkg chooses the latest. Force it to use the
+    # latest (14.39 currently).
+    - name: Setup MSVC toolset (VS 2022)
+    uses: TheMrMilchmann/setup-msvc-dev@v3
+    if: matrix.os == 'windows-2022'
+    with:
+      arch: x64
+      toolset: 14.39
+
     - name: Build if required
       id: build-binaries
       run: |

diff --git a/build-matrix.json b/build-matrix.json
@@ -737,7 +737,7 @@
             "artifactsWin": "OrthancAzureBlobStorage.dll",
             "buildForMacOS": false,
             "buildForWin": true,
-            "preBuildWin": "rm -rf '/c/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/14.38.33130' && cd /c/vcpkg && git checkout 2023.06.20 && vcpkg install cryptopp:x64-windows-static azure-storage-blobs-cpp:x64-windows-static",
+            "preBuildWin": "cd /c/vcpkg && git checkout 2023.06.20 && vcpkg install cryptopp:x64-windows-static azure-storage-blobs-cpp:x64-windows-static",
             "extraCMakeFlagsWin": "-DCMAKE_TOOLCHAIN_FILE=/c/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static",
             "windows": [{
                 "Description": "Orthanc Azure blob storage plugin (AGPL license)",