aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-03-15 19:36:46 +0000
committerJussi Pakkanen <jpakkane@gmail.com>2021-03-15 19:36:46 +0000
commit600b3e7b1eb27e046e360ba10a48e89d9b18340b (patch)
treeff1ca8783a8877d1a86e446669f3b3b38f726ecb
parent2be074b1d445fcd30535bcf7518f8ce0738bcbf3 (diff)
downloadmeson-vsmodver.zip
meson-vsmodver.tar.gz
meson-vsmodver.tar.bz2
Update VS module version check.vsmodver
-rw-r--r--mesonbuild/mesonlib/universal.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py
index b0c50c8..b0b987e 100644
--- a/mesonbuild/mesonlib/universal.py
+++ b/mesonbuild/mesonlib/universal.py
@@ -685,6 +685,12 @@ def detect_vcs(source_dir: T.Union[str, Path]) -> T.Optional[T.Dict[str, str]]:
def current_vs_supports_modules() -> bool:
vsver = os.environ.get('VSCMD_VER', '')
+ nums = vsver.split('.', 2)
+ major = int(nums[0])
+ if major >= 17:
+ return True
+ if major == 16 and int(nums[1]) >= 10:
+ return True
return vsver.startswith('16.9.0') and '-pre.' in vsver
# a helper class which implements the same version ordering as RPM