Commit aeae176a authored by Nirbheek Chauhan's avatar Nirbheek Chauhan

meson.recipe: Add support for VS2019

Bumping to 0.50.1 would also work, but it's too close to the 1.16
release to do that.
parent 5c2f64b1
......@@ -18,6 +18,9 @@ class Recipe(recipe.Recipe):
'meson/0001-find_library-Check-arch-of-libraries-on-Darwin.patch',
# https://github.com/mesonbuild/meson/pull/4864, in 0.50
'meson/0001-macos-lipo-outputs-aarch64-as-arm64-fix-it.patch'
# https://github.com/mesonbuild/meson/pull/5274, fixed in 0.50.1
# Not actually in 0.50.1, but it's just not needed in 0.50.*
'meson/0001-meson-Add-a-quick-hack-to-support-VS2019.patch'
]
deps = ['ninja']
......
From db6157bd3d21b1e807fe918e5a352b216660d548 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed, 17 Apr 2019 18:54:26 +0530
Subject: [PATCH] meson: Add a quick-hack to support VS2019
Proper support is already upstream in 0.50.1, but it's too close to
the 1.16 release to bump to that.
---
mesonbuild/compilers/c.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 655dfb3..d47694e 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -1563,6 +1563,8 @@ class VisualStudioCCompiler(CCompiler):
return '14.0' # (Visual Studio 2015)
elif version < 1920:
return '14.1' # (Visual Studio 2017)
+ elif version < 1930:
+ return '14.2' # (Visual Studio 2017)
return None
def get_default_include_dirs(self):
--
2.20.1.windows.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment