diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-05 00:02:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 00:02:41 +0300 |
| commit | b42adc8a5460c44226dc42291df790c6ec954922 (patch) | |
| tree | 41a8e726bc3afdd303f46880da68fea99261e669 /mesonbuild/optinterpreter.py | |
| parent | 655757bc00d8588a64b4fcac5146c0dd8516b93f (diff) | |
| parent | 41769d0c105f071cd7dad9eafaa4092683c583c4 (diff) | |
| download | meson-b42adc8a5460c44226dc42291df790c6ec954922.zip meson-b42adc8a5460c44226dc42291df790c6ec954922.tar.gz meson-b42adc8a5460c44226dc42291df790c6ec954922.tar.bz2 | |
Merge pull request #1511 from centricular/get-define
New compiler function: cc.get_define()
Diffstat (limited to 'mesonbuild/optinterpreter.py')
| -rw-r--r-- | mesonbuild/optinterpreter.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index 10b8fab..f9e7f26 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -75,15 +75,16 @@ class OptionInterpreter: self.cmd_line_options = {} for o in command_line_options: if self.subproject != '': # Strip the beginning. + # Ignore options that aren't for this subproject if not o.startswith(self.sbprefix): continue - else: - if ':' in o: - continue try: (key, value) = o.split('=', 1) except ValueError: raise OptionException('Option {!r} must have a value separated by equals sign.'.format(o)) + # Ignore subproject options if not fetching subproject options + if self.subproject == '' and ':' in key: + continue self.cmd_line_options[key] = value def process(self, option_file): |