From 55759e4aa990a9755e29f35a4aec6c0a6e89c7d7 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 6 Aug 2014 21:40:09 +0300 Subject: Can specify project options on the command line and the override defaults. --- interpreter.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'interpreter.py') 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) -- cgit v1.1