diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-10 13:13:28 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-02-10 13:13:28 +0200 |
commit | 3aff6de3e6df3838a8fb1bfc70e99e3c47eead34 (patch) | |
tree | bdff1f44e1154b4d305f4322e262901d35921daf /interpreter.py | |
parent | b279ba572d2516a2df41b12f59eceafad4962221 (diff) | |
download | meson-3aff6de3e6df3838a8fb1bfc70e99e3c47eead34.zip meson-3aff6de3e6df3838a8fb1bfc70e99e3c47eead34.tar.gz meson-3aff6de3e6df3838a8fb1bfc70e99e3c47eead34.tar.bz2 |
Specify language for global_arguments with keyword arguments.
Diffstat (limited to 'interpreter.py')
-rwxr-xr-x | interpreter.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/interpreter.py b/interpreter.py index 8de9d16..678f43f 100755 --- a/interpreter.py +++ b/interpreter.py @@ -537,18 +537,19 @@ class Interpreter(): i = IncludeDirs(self.subdir, args, kwargs) return i - def func_add_global_arguments(self, node, args): + def func_add_global_arguments(self, node, args, kwargs): for a in args: if not isinstance(a, str): raise InvalidArguments('Line %d: Argument %s is not a string.' % (node.lineno(), str(a))) if len(self.build.get_targets()) > 0: raise InvalidCode('Line %d: global flags can not be set once any build target is defined.' % node.lineno()) - lang = args[0].lower() - switches = args[1:] + if not 'language' in kwargs: + raise InvalidCode('Line %d: missing language definition in add_global_arguments' % node.lineno()) + lang = kwargs['language'].lower() if lang in self.build.global_args: - self.build.global_args[lang] += switches + self.build.global_args[lang] += args else: - self.build.global_args[lang] = switches + self.build.global_args[lang] = args def flatten(self, args): if isinstance(args, nodes.StringStatement): |