diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-09-06 23:41:39 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-09-06 23:41:39 +0300 |
| commit | fc6b2c7c9b35165402e4deab5410aa0ee7be52f4 (patch) | |
| tree | d2ad8ef4a424f066dcea31d4009e5f83392425f9 | |
| parent | 69433025ca8523838dbe55d0c20ea28cbc51cc23 (diff) | |
| download | meson-srcroot.tar.gz | |
Return subproject source root when asking for meson.source_root() in a subproject. Closes #722.srcroot
| -rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index ad381b6d9..a57aea152 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -943,7 +943,11 @@ class MesonMain(InterpreterObject): return os.path.join(src, sub) def source_root_method(self, args, kwargs): - return self.interpreter.environment.source_dir + if self.interpreter.subproject == '': + return self.interpreter.environment.source_dir + return os.path.join(self.interpreter.environment.source_dir, + self.interpreter.subproject_dir, + self.interpreter.subproject) def build_root_method(self, args, kwargs): return self.interpreter.environment.build_dir |