aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorAnton Kochkov <anton.kochkov@gmail.com>2019-03-12 13:36:33 +0800
committerJussi Pakkanen <jpakkane@gmail.com>2019-04-16 00:11:02 +0300
commitad0ba6a911b9fcdca24379bb4f14b4b5a312a3d5 (patch)
treee45336ec8a1c1ed9415aae5223b2c9dce198c9d3 /mesonbuild
parentb510bc12ac55ffd074b32136802f59f599e14b9e (diff)
downloadmeson-ad0ba6a911b9fcdca24379bb4f14b4b5a312a3d5.zip
meson-ad0ba6a911b9fcdca24379bb4f14b4b5a312a3d5.tar.gz
meson-ad0ba6a911b9fcdca24379bb4f14b4b5a312a3d5.tar.bz2
Add VS2019 backend CI and docs.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/vs2010backend.py2
-rw-r--r--mesonbuild/backend/vs2019backend.py34
2 files changed, 35 insertions, 1 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index 2ef8187..3b9f541 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -207,7 +207,7 @@ class Vs2010Backend(backends.Backend):
if 'VCINSTALLDIR' in os.environ:
vs_version = os.environ['VisualStudioVersion'] \
if 'VisualStudioVersion' in os.environ else None
- relative_path = 'Auxiliary\\Build\\' if vs_version == '15.0' else ''
+ relative_path = 'Auxiliary\\Build\\' if vs_version >= '15.0' else ''
script_path = os.environ['VCINSTALLDIR'] + relative_path + 'vcvarsall.bat'
if os.path.exists(script_path):
if has_arch_values:
diff --git a/mesonbuild/backend/vs2019backend.py b/mesonbuild/backend/vs2019backend.py
new file mode 100644
index 0000000..c6e78cb
--- /dev/null
+++ b/mesonbuild/backend/vs2019backend.py
@@ -0,0 +1,34 @@
+# Copyright 2014-2019 The Meson development team
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import os
+import xml.etree.ElementTree as ET
+
+from .vs2010backend import Vs2010Backend
+
+
+class Vs2019Backend(Vs2010Backend):
+ def __init__(self, build):
+ super().__init__(build)
+ self.name = 'vs2019'
+ self.platform_toolset = 'v142'
+ self.vs_version = '2019'
+ # WindowsSDKVersion should be set by command prompt.
+ sdk_version = os.environ.get('WindowsSDKVersion', None)
+ if sdk_version:
+ self.windows_target_platform_version = sdk_version.rstrip('\\')
+
+ def generate_debug_information(self, link):
+ # valid values for vs2019 is 'false', 'true', 'DebugFastLink', 'DebugFull'
+ ET.SubElement(link, 'GenerateDebugInformation').text = 'DebugFull'