diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-11-12 08:59:34 +0000 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-11-12 08:59:34 +0000 |
| commit | 9753bef96e5561c0259b51f14dba367b79dfb945 (patch) | |
| tree | 4216008118889acb6950af8fe689a38c22303e6e | |
| parent | 45f3e0457b8723710adbe6b38e2df65344fda692 (diff) | |
| parent | 3fe428c2e734869c7fa69d038ff7954971cae508 (diff) | |
Merge branch 'cairomm-1-16' into 'cairomm-1-16'
build: Support Visual Studio 2022
See merge request cairo/cairomm!20
| -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 bf2e906..58b7092 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 7c5168e..2c0c8bb 100644 --- a/meson.build +++ b/meson.build @@ -229,7 +229,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' |