From 74d415f2a4c7a71524e7e32015d7c16db641d396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Mon, 5 Jan 2026 20:03:54 +0100 Subject: [PATCH 1/2] Use VS2026 generator to build mob. --- bootstrap.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap.ps1 b/bootstrap.ps1 index 9cbec3d..03f21f7 100644 --- a/bootstrap.ps1 +++ b/bootstrap.ps1 @@ -17,7 +17,8 @@ cmake --preset vcpkg --log-level=$logLevel if ($Verbose) { cmake --build --preset $Config --verbose -} else { +} +else { cmake --build --preset $Config } From 5f88eeab02a6d3dcdd728accd732cdc36ef20c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Thu, 5 Feb 2026 19:32:54 +0100 Subject: [PATCH 2/2] Update CI to use VS2026. --- .github/workflows/build.yml | 2 +- CMakePresets.json | 26 ++++---------------------- bootstrap.ps1 | 6 +++--- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8fd200c..fedb940 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ env: jobs: build: - runs-on: windows-2022 + runs-on: windows-2025-vs2026 steps: - uses: actions/checkout@v6 - name: Build Mob diff --git a/CMakePresets.json b/CMakePresets.json index e084288..022e43b 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -2,8 +2,8 @@ "version": 6, "configurePresets": [ { - "name": "vcpkg", - "generator": "Visual Studio 17 2022", + "name": "vs2026-windows", + "generator": "Visual Studio 18 2026", "architecture": "x64", "binaryDir": "${sourceDir}/build/", "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", @@ -15,32 +15,14 @@ ], "buildPresets": [ { - "name": "Base", - "hidden": true, + "name": "vs2026-windows", + "configurePreset": "vs2026-windows", "nativeToolOptions": [ "-m", "-noLogo", "-p:UseMultiToolTask=true", "-p:EnforceProcessCountAcrossBuilds=true" ] - }, - { - "name": "Debug", - "configurePreset": "vcpkg", - "inherits": "Base", - "configuration": "Debug" - }, - { - "name": "Release", - "configurePreset": "vcpkg", - "inherits": "Base", - "configuration": "Release" - }, - { - "name": "RelWithDebInfo", - "configurePreset": "vcpkg", - "inherits": "Base", - "configuration": "RelWithDebInfo" } ] } diff --git a/bootstrap.ps1 b/bootstrap.ps1 index 03f21f7..eae510b 100644 --- a/bootstrap.ps1 +++ b/bootstrap.ps1 @@ -13,13 +13,13 @@ if (!$root) { $logLevel = if ($Verbose) { "STATUS" } else { "ERROR" } -cmake --preset vcpkg --log-level=$logLevel +cmake --preset vs2026-windows --log-level=$logLevel if ($Verbose) { - cmake --build --preset $Config --verbose + cmake --build --preset vs2026-windows --config $Config --verbose } else { - cmake --build --preset $Config + cmake --build --preset vs2026-windows --config $Config } if (! $?) {