diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-08-06 21:40:09 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-08-06 21:40:23 +0300 |
| commit | 55759e4aa990a9755e29f35a4aec6c0a6e89c7d7 (patch) | |
| tree | 81baca8d69769e95ad3486c3f67f71b0ca506cc6 /interpreter.py | |
| parent | 4119859c3d20231a5a2592e5d0be756cf978cdc9 (diff) | |
| download | meson-55759e4aa990a9755e29f35a4aec6c0a6e89c7d7.zip meson-55759e4aa990a9755e29f35a4aec6c0a6e89c7d7.tar.gz meson-55759e4aa990a9755e29f35a4aec6c0a6e89c7d7.tar.bz2 | |
Can specify project options on the command line and the override defaults.
Diffstat (limited to 'interpreter.py')
| -rw-r--r-- | interpreter.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/interpreter.py b/interpreter.py index 776a897..d226d86 100644 --- a/interpreter.py +++ b/interpreter.py @@ -639,7 +639,8 @@ class Interpreter(): self.source_root = build.environment.get_source_dir() option_file = os.path.join(self.source_root, self.subdir, 'meson_options.txt') if os.path.exists(option_file): - oi = optinterpreter.OptionInterpreter(self.subproject) + oi = optinterpreter.OptionInterpreter(self.subproject,\ + self.build.environment.cmd_line_options) oi.process(option_file) self.build.environment.merge_options(oi.options) mesonfile = os.path.join(self.source_root, self.subdir, environment.build_filename) |