diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-08 23:32:31 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-08 23:32:31 +0300 |
| commit | d532dbef4254638ea09706678160a009f3b26ab2 (patch) | |
| tree | 2d5366963c2bd8ee6e42b125644b7b29377ca6fe /interpreter.py | |
| parent | e3b72045c42e11b372d468899e570be229b24fc4 (diff) | |
| download | meson-d532dbef4254638ea09706678160a009f3b26ab2.zip meson-d532dbef4254638ea09706678160a009f3b26ab2.tar.gz meson-d532dbef4254638ea09706678160a009f3b26ab2.tar.bz2 | |
Fix use of shared subprojects.
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 f14e981..d140c19 100644 --- a/interpreter.py +++ b/interpreter.py @@ -1020,7 +1020,7 @@ class Interpreter(): fullstack = self.subproject_stack + [dirname] incpath = ' => '.join(fullstack) raise InterpreterException('Recursive include of subprojects: %s.' % incpath) - if dirname == self.subprojects: + if dirname in self.subprojects: return self.subprojects[dirname] subdir = os.path.join('subprojects', dirname) r = wrap.Resolver(os.path.join(self.build.environment.get_source_dir(), 'subprojects')) @@ -1037,6 +1037,7 @@ class Interpreter(): subi.run() mlog.log('\nSubproject', mlog.bold(dirname), 'finished.') self.build.subprojects[dirname] = True + self.subprojects.update(subi.subprojects) self.subprojects[dirname] = SubprojectHolder(subi) self.build_def_files += subi.build_def_files return self.subprojects[dirname] |