diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-10-05 20:26:36 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-10-05 20:26:36 +0300 |
| commit | 606dfed39f25e73de665a10c6a8dc052da0f01f6 (patch) | |
| tree | b9aab0bdc2cbdc6bdd15389dc0c671152c9e3e27 /ninjabackend.py | |
| parent | c02009a6989710714cc0e2becc9cad11d4b0381d (diff) | |
| parent | 68fdef88cbf3a9c0a08b565c40879102f753f19a (diff) | |
| download | meson-606dfed39f25e73de665a10c6a8dc052da0f01f6.zip meson-606dfed39f25e73de665a10c6a8dc052da0f01f6.tar.gz meson-606dfed39f25e73de665a10c6a8dc052da0f01f6.tar.bz2 | |
Merge pull request #274 from mesonbuild/privinc
Make it possible to expose private directory for header inclusion
Diffstat (limited to 'ninjabackend.py')
| -rw-r--r-- | ninjabackend.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ninjabackend.py b/ninjabackend.py index 2f611a1..e011848 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -169,7 +169,10 @@ class NinjaBackend(backends.Backend): continue for src in gensource.get_outfilelist(): if self.environment.is_header(src): - header_deps.append(src) + header_deps.append(os.path.join(self.get_target_private_dir(target), src)) + for dep in target.link_targets: + if isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): + header_deps += self.get_generated_headers(dep) return header_deps def generate_target(self, target, outfile): @@ -1308,6 +1311,8 @@ rule FORTRAN_DEP_HACK sargs = compiler.get_include_args(srctreedir) commands += bargs commands += sargs + for d in i.get_extra_build_dirs(): + commands += compiler.get_include_args(d) custom_target_include_dirs = [] for i in target.generated: if isinstance(i, build.CustomTarget): |