diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-19 01:14:05 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-20 16:52:45 -0500 |
| commit | 8f41154827d9608234d0c0455551392d968d9e23 (patch) | |
| tree | e180bf6db1c2bd2f8370108b693c5e7a45a9bf7f /mesonbuild/backend/ninjabackend.py | |
| parent | aa9668a2fc40b728ec0e3afed85ac9e12c3c50f1 (diff) | |
| download | meson-8f41154827d9608234d0c0455551392d968d9e23.zip meson-8f41154827d9608234d0c0455551392d968d9e23.tar.gz meson-8f41154827d9608234d0c0455551392d968d9e23.tar.bz2 | |
Can specify headers to install with Files.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 8efb5fb..2bfb822 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -656,12 +656,15 @@ int dummy; incroot = self.environment.get_includedir() headers = self.build.get_headers() + srcdir = self.environment.get_source_dir() + builddir = self.environment.get_build_dir() for h in headers: outdir = h.get_custom_install_dir() if outdir is None: outdir = os.path.join(incroot, h.get_install_subdir()) for f in h.get_sources(): - abspath = os.path.join(self.environment.get_source_dir(), h.get_source_subdir(), f) + assert(isinstance(f, File)) + abspath = f.absolute_path(srcdir, builddir) i = [abspath, outdir] d.headers.append(i) |