[pangomm] build: Support Visual Studio 2022 builds
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pangomm] build: Support Visual Studio 2022 builds
- Date: Wed, 10 Nov 2021 09:06:01 +0000 (UTC)
commit c1ca84c6b407754a8705f39a78f01d14eef7a9da
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Nov 10 16:43:59 2021 +0800
build: Support Visual Studio 2022 builds
Make these builds distinct from the Visual Studio 2019 builds.
MSVC_NMake/detectenv-msvc.mak | 5 ++++-
meson.build | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index 5d2f78a..b99227c 100644
--- a/MSVC_NMake/detectenv-msvc.mak
+++ b/MSVC_NMake/detectenv-msvc.mak
@@ -98,9 +98,12 @@ PDBVER = 14
!if $(VCVERSION) > 1909 && $(VCVERSION) < 1920
VSVER_SUFFIX = 1
VSVER = 15
-!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930
VSVER_SUFFIX = 2
VSVER = 16
+!elseif $(VCVERSION) > 1929 && $(VCVERSION) < 2000
+VSVER_SUFFIX = 3
+VSVER = 17
!else
VSVER = $(PDBVER)
!endif
diff --git a/meson.build b/meson.build
index 4a12829..633c729 100644
--- a/meson.build
+++ b/meson.build
@@ -175,7 +175,9 @@ if is_msvc
# Put in the toolset version if the build is done with Visual Studio
# 2017 or later, unless explicitly told not to
if use_msvc14x_toolset_ver
- if cpp_compiler.version().version_compare('>=19.20')
+ if cpp_compiler.version().version_compare('>=19.30')
+ msvc14x_toolset_ver = '-vc143'
+ elif cpp_compiler.version().version_compare('>=19.20')
msvc14x_toolset_ver = '-vc142'
elif cpp_compiler.version().version_compare('>=19.10')
msvc14x_toolset_ver = '-vc141'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]