aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-02-15 17:54:38 +0000
committerJussi Pakkanen <jpakkane@gmail.com>2021-02-15 17:54:38 +0000
commit0b9f131ae40c8704f0f267b3c1311722636def81 (patch)
treed4614ec6b46b0083504a890250659d1671674e75
parentf5bc0f33da1cdb7e9ac193d124ec0780a4b51584 (diff)
downloadmeson-vsmodfix.zip
meson-vsmodfix.tar.gz
meson-vsmodfix.tar.bz2
Fix VS C++ module support.vsmodfix
-rw-r--r--mesonbuild/backend/ninjabackend.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 6efa8da..b5f46df 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -880,7 +880,8 @@ int dummy;
cpp = target.compilers['cpp']
if cpp.get_id() != 'msvc':
return False
- if self.environment.coredata.options[OptionKey('std', machine=target.for_machine, lang='cpp')] != 'latest':
+ cppversion = self.environment.coredata.options[OptionKey('std', machine=target.for_machine, lang='cpp')].value
+ if cppversion not in ('latest', 'c++latest', 'vc++latest'):
return False
if not mesonlib.current_vs_supports_modules():
return False