diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-04-09 22:51:38 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-04-10 23:13:47 +0300 |
| commit | 04710b087a3033aa692e1fc3bdbb2dbe2a8ec70e (patch) | |
| tree | 03c70cf84f31cf74354d1eafb00344c21e7c225d | |
| parent | 02ff9829c43bb4d0854f5212f446c2953b7fdb75 (diff) | |
| download | meson-04710b087a3033aa692e1fc3bdbb2dbe2a8ec70e.zip meson-04710b087a3033aa692e1fc3bdbb2dbe2a8ec70e.tar.gz meson-04710b087a3033aa692e1fc3bdbb2dbe2a8ec70e.tar.bz2 | |
Add support for VS2019. Closes #4640.
| -rw-r--r-- | mesonbuild/backend/backends.py | 3 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 4 | ||||
| -rw-r--r-- | mesonbuild/coredata.py | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 119c1c2..4a4f7f4 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -141,6 +141,9 @@ def get_backend_from_name(backend, build): elif backend == 'vs2017': from . import vs2017backend return vs2017backend.Vs2017Backend(build) + elif backend == 'vs2019': + from . import vs2019backend + return vs2019backend.Vs2019Backend(build) elif backend == 'xcode': from . import xcodebackend return xcodebackend.XCodeBackend(build) diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 6d62553..2ef8187 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -46,6 +46,10 @@ def autodetect_vs_version(build): 'Visual Studio\\2017' in vs_install_dir: from mesonbuild.backend.vs2017backend import Vs2017Backend return Vs2017Backend(build) + if vs_version == '16.0' or 'Visual Studio 19' in vs_install_dir or \ + 'Visual Studio\\2019' in vs_install_dir: + from mesonbuild.backend.vs2019backend import Vs2019Backend + return Vs2019Backend(build) if 'Visual Studio 10.0' in vs_install_dir: return Vs2010Backend(build) raise MesonException('Could not detect Visual Studio using VisualStudioVersion: {!r} or VSINSTALLDIR: {!r}!\n' diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 739f6e7..6b86529 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -29,7 +29,7 @@ import configparser from typing import Optional, Any, TypeVar, Generic, Type version = '0.50.999' -backendlist = ['ninja', 'vs', 'vs2010', 'vs2015', 'vs2017', 'xcode'] +backendlist = ['ninja', 'vs', 'vs2010', 'vs2015', 'vs2017', 'vs2019', 'xcode'] default_yielding = False |