diff options
| author | Scott D Phillips <scott.d.phillips@intel.com> | 2016-10-25 14:50:26 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-02 13:52:04 -0700 |
| commit | 3650669874050c7990a751e799542dbf1b1805bf (patch) | |
| tree | ae9dce4cb85f3745270564f58909309ecfb75f8b /mesonbuild/interpreter.py | |
| parent | aeaccdc418e9e12bf64b5b3bd21751e0e71c7c2b (diff) | |
| download | meson-3650669874050c7990a751e799542dbf1b1805bf.zip meson-3650669874050c7990a751e799542dbf1b1805bf.tar.gz meson-3650669874050c7990a751e799542dbf1b1805bf.tar.bz2 | |
Allow subproject declarations in subdirectories
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 50de9e1..3044d51 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1552,10 +1552,6 @@ class Interpreter(): return self.do_subproject(dirname, kwargs) def do_subproject(self, dirname, kwargs): - if self.subdir != '': - segs = os.path.split(self.subdir) - if len(segs) != 2 or segs[0] != self.subproject_dir: - raise InterpreterException('Subprojects must be defined at the root directory.') if dirname in self.subproject_stack: fullstack = self.subproject_stack + [dirname] incpath = ' => '.join(fullstack) |