diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-09 00:04:07 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-03-09 00:04:07 +0200 |
commit | 6b563521feea33ff962abf7406ec3f1fcadca6cd (patch) | |
tree | 5fcef91ea2bd581b67a50c6c6f33f0dd838a9193 /interpreter.py | |
parent | 0a4818164de8b35fff1b80020d2f7a6ede8f7036 (diff) | |
download | meson-6b563521feea33ff962abf7406ec3f1fcadca6cd.zip meson-6b563521feea33ff962abf7406ec3f1fcadca6cd.tar.gz meson-6b563521feea33ff962abf7406ec3f1fcadca6cd.tar.bz2 |
Subproject definition files are important, too.
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 f0a0796..b03faf8 100644 --- a/interpreter.py +++ b/interpreter.py @@ -616,7 +616,7 @@ class Interpreter(): self.builtin['meson'] = MesonMain(build, self) self.environment = build.environment self.build_func_dict() - self.build_def_files = [environment.build_filename] + self.build_def_files = [os.path.join(self.subdir, environment.build_filename)] self.coredata = self.environment.get_coredata() self.generators = [] self.visited_subdirs = {} @@ -829,6 +829,7 @@ class Interpreter(): mlog.log('\nSubproject', mlog.bold(dirname), 'finished.') self.build.subprojects[dirname] = True self.subprojects[dirname] = SubprojectHolder(subi) + self.build_def_files += subi.build_def_files return self.subprojects[dirname] def func_get_option(self, nodes, args, kwargs): |