Skip to content

Commit a295acf

Browse files
committed
Merge branch 'drop-msvc-2019' into 'master'
Drop MSVC 2019 support, support 2026 instead See merge request OpenMW/openmw!5133
2 parents a95543f + 35f19d8 commit a295acf

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
required: true
99
type: string
1010
msvc:
11-
description: MSVC version (2019/2022)
11+
description: MSVC version (2022/2026)
1212
default: "2022"
1313
type: string
1414
vcpkg-deps-tag:

CI/before_script.msvc.sh

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Options:
161161
Build unit tests / Google test
162162
-u
163163
Configure for unity builds.
164-
-v <2019/2022>
164+
-v <2022/2026>
165165
Choose the Visual Studio version to use.
166166
-n
167167
Produce NMake makefiles instead of a Visual Studio solution. Cannot be used with -N.
@@ -366,30 +366,34 @@ if [ -z $PLATFORM ]; then
366366
fi
367367

368368
if [ -z $VS_VERSION ]; then
369-
VS_VERSION="2019"
369+
VS_VERSION="2022"
370370
fi
371371

372372
case $VS_VERSION in
373+
18|18.0|2026 )
374+
GENERATOR="Visual Studio 18 2026"
375+
MSVC_REAL_VER="18"
376+
MSVC_DISPLAY_YEAR="2026"
377+
378+
DEPS_MSVC_YEAR="2022"
379+
QT_MSVC_YEAR="2019"
380+
381+
VCPKG_TRIPLET="x64-windows"
382+
;;
373383
17|17.0|2022 )
374384
GENERATOR="Visual Studio 17 2022"
375-
MSVC_TOOLSET="vc143"
376385
MSVC_REAL_VER="17"
377386
MSVC_DISPLAY_YEAR="2022"
378387

388+
DEPS_MSVC_YEAR="2022"
379389
QT_MSVC_YEAR="2019"
380390

381391
VCPKG_TRIPLET="x64-windows"
382392
;;
383393

384394
16|16.0|2019 )
385-
GENERATOR="Visual Studio 16 2019"
386-
MSVC_TOOLSET="vc142"
387-
MSVC_REAL_VER="16"
388-
MSVC_DISPLAY_YEAR="2019"
389-
390-
QT_MSVC_YEAR="2019"
391-
392-
VCPKG_TRIPLET="x64-windows-2019"
395+
echo "Visual Studio 2019 is no longer supported"
396+
wrappedExit 1
393397
;;
394398

395399
15|15.0|2017 )
@@ -553,8 +557,8 @@ source "$(dirname -- "${BASH_SOURCE[0]}")/deps_versions.msvc.sh"
553557
# versions that don't affect the CI cache can go here
554558
AQT_VERSION='v3.1.15'
555559

556-
VCPKG_PATH="vcpkg-x64-windows-${VS_VERSION:?}-${VCPKG_TAG:?}"
557-
VCPKG_PDB_PATH="vcpkg-x64-windows-${VS_VERSION:?}-pdb-${VCPKG_TAG:?}"
560+
VCPKG_PATH="vcpkg-x64-windows-${DEPS_MSVC_YEAR:?}-${VCPKG_TAG:?}"
561+
VCPKG_PDB_PATH="vcpkg-x64-windows-${DEPS_MSVC_YEAR:?}-pdb-${VCPKG_TAG:?}"
558562
VCPKG_MANIFEST="${VCPKG_PATH:?}-manifest.txt"
559563
VCPKG_PDB_MANIFEST="${VCPKG_PDB_PATH:?}-manifest.txt"
560564

@@ -915,7 +919,7 @@ if [ -n "$ACTIVATE_MSVC" ]; then
915919
inheritEnvironments=msvc_x86
916920
fi
917921
fi
918-
echo "In Visual Studio 15.3 (2017 Update 3) or later, try setting '\"inheritEnvironments\": [ \"$inheritEnvironments\" ]' in CMakeSettings.json to build in the IDE."
922+
echo "In Visual Studio, try setting '\"inheritEnvironments\": [ \"$inheritEnvironments\" ]' in CMakeSettings.json to build in the IDE."
919923
fi
920924

921925
wrappedExit $RET

0 commit comments

Comments
 (0)