diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-09 00:46:33 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-04-09 00:46:33 +0300 |
| commit | dfee5e5200efcfbc7f84287f46022d2cd63a15b9 (patch) | |
| tree | afca1963ea656434bcf16af89d8881b169898c32 | |
| parent | 4952d2628e4e9fa8c512678b585821f09d0baba6 (diff) | |
| download | meson-dfee5e5200efcfbc7f84287f46022d2cd63a15b9.zip meson-dfee5e5200efcfbc7f84287f46022d2cd63a15b9.tar.gz meson-dfee5e5200efcfbc7f84287f46022d2cd63a15b9.tar.bz2 | |
Fix subproject again.
| -rw-r--r-- | interpreter.py | 1 | ||||
| -rw-r--r-- | test cases/common/80 shared subproject 2/meson.build | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/interpreter.py b/interpreter.py index d140c19..75df340 100644 --- a/interpreter.py +++ b/interpreter.py @@ -1032,6 +1032,7 @@ class Interpreter(): self.global_args_frozen = True mlog.log('\nExecuting subproject ', mlog.bold(dirname), '.\n', sep='') subi = Interpreter(self.build, dirname, subdir) + subi.subprojects = self.subprojects subi.subproject_stack = self.subproject_stack + [dirname] subi.run() diff --git a/test cases/common/80 shared subproject 2/meson.build b/test cases/common/80 shared subproject 2/meson.build index a0ce0f4..0647325 100644 --- a/test cases/common/80 shared subproject 2/meson.build +++ b/test cases/common/80 shared subproject 2/meson.build @@ -1,5 +1,8 @@ project('A', 'c') +# Same as the previous test but use C and B in +# the opposite order. + C = subproject('C') c = C.get_variable('c') |