2 Commits
Author SHA1 Message Date
Mikaël Capelle 5f88eeab02 Update CI to use VS2026. 2026-02-06 19:39:24 +01:00
Mikaël Capelle 74d415f2a4 Use VS2026 generator to build mob. 2026-02-06 19:34:20 +01:00
3 changed files with 10 additions and 27 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ env:
jobs:
build:
runs-on: windows-2022
runs-on: windows-2025-vs2026
steps:
- uses: actions/checkout@v6
- name: Build Mob
+4 -22
View File
@@ -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"
}
]
}
+5 -4
View File
@@ -13,12 +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
} else {
cmake --build --preset $Config
cmake --build --preset vs2026-windows --config $Config --verbose
}
else {
cmake --build --preset vs2026-windows --config $Config
}
if (! $?) {