diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-11-12 08:58:28 +0000 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-11-12 08:58:28 +0000 |
| commit | f33fd2c8f35b7ee1852f62f3f7389b09075e1e0f (patch) | |
| tree | 8a86a115156ecf7131db3aca8dbe3a9fe49af0c2 | |
| parent | ec5f5d5e940e2e798f7df3c50d55129a797e1d41 (diff) | |
| parent | 7a77ad0d31f5024c2aed6bdc3c98b790836e9290 (diff) | |
Merge branch 'cairomm-1-14' into 'cairomm-1-14'
build: Support Visual Studio 2022
See merge request cairo/cairomm!19
| -rw-r--r-- | MSVC_NMake/detectenv-msvc.mak | 5 | ||||
| -rw-r--r-- | 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 d60b306..98a9199 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 a8435da..3a4f63a 100644 --- a/meson.build +++ b/meson.build @@ -231,7 +231,9 @@ if is_msvc add_project_arguments(disabled_warning, language: 'cpp') endforeach 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' |