diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-12-09 20:39:53 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-12-09 20:39:53 +0200 |
| commit | e21e7091e73694ded98d8230604f264b11fcba47 (patch) | |
| tree | 8a328630ba9805e0d53c5a3536f28b4dfba4b887 /interpreter.py | |
| parent | 11c812769af05126732d65bf6bf6da97afd42b1c (diff) | |
| download | meson-e21e7091e73694ded98d8230604f264b11fcba47.zip meson-e21e7091e73694ded98d8230604f264b11fcba47.tar.gz meson-e21e7091e73694ded98d8230604f264b11fcba47.tar.bz2 | |
Track dependencies of subproject option files.
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 b32e47a..e5348ec 100644 --- a/interpreter.py +++ b/interpreter.py @@ -740,7 +740,7 @@ class Interpreter(): raise InterpreterException('Subprojects must be defined at the root directory.') if self.subproject != '': raise InterpreterException('Subprojects of subprojects are not yet supported.') - if dirname in self.subprojects: + if dirname in self.build.subprojects: raise InterpreterException('Tried to add the same subproject twice.') subdir = os.path.join(self.subproject, self.subdir, dirname) abs_subdir = os.path.join(self.build.environment.get_source_dir(), subdir) @@ -751,6 +751,7 @@ class Interpreter(): subi = Interpreter(self.build, subdir) subi.run() mlog.log('\nSubproject finished.\n') + self.build.subprojects[dirname] = True self.subprojects[dirname] = SubprojectHolder(subi) return self.subprojects[dirname] |