[pangomm/pangomm-2-48] build: Support Visual Studio 2022 builds

[Chun-wei Fan <fanchunwei src gnome org>]

commit 3b15556eba573e286cf78d3eb3bb501ad0439d7e
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 | 7 +++++--
 meson.build                   | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/MSVC_NMake/detectenv-msvc.mak b/MSVC_NMake/detectenv-msvc.mak
index 5d2f78a..8ffc2fc 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
-VSVER_SUFFIX = 2
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 1930
+VSVER_SUFFIX = 1
 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 4e59755..6eca6f0 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'