diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-13 21:11:27 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-13 21:17:13 +0300 |
| commit | 475175f4b5e5aecdd48455efb6a10f4bd7ce7b81 (patch) | |
| tree | 55500ec44b4fb33cf4c3cba1b5fb6388154f2668 /mesonbuild/backend/backends.py | |
| parent | f0626e6cc15bfcba66e3218314f9aee5ba3d6052 (diff) | |
| download | meson-475175f4b5e5aecdd48455efb6a10f4bd7ce7b81.zip meson-475175f4b5e5aecdd48455efb6a10f4bd7ce7b81.tar.gz meson-475175f4b5e5aecdd48455efb6a10f4bd7ce7b81.tar.bz2 | |
Can use generator outputs in custom targets. Closes #587.
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 4ff1553..109861c 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -473,14 +473,16 @@ class Backend(): if hasattr(i, 'held_object'): i = i.held_object if isinstance(i, str): - fname = os.path.join(self.build_to_src, target.subdir, i) + fname = [os.path.join(self.build_to_src, target.subdir, i)] elif isinstance(i, build.BuildTarget): - fname = self.get_target_filename(i) + fname = [self.get_target_filename(i)] + elif isinstance(i, build.GeneratedList): + fname = [os.path.join(self.get_target_private_dir(target), p) for p in i.get_outfilelist()] else: - fname = i.rel_to_builddir(self.build_to_src) + fname = [i.rel_to_builddir(self.build_to_src)] if absolute_paths: - fname = os.path.join(self.environment.get_build_dir(), fname) - srcs.append(fname) + fname =[os.path.join(self.environment.get_build_dir(), f) for f in fname] + srcs += fname cmd = [] for i in target.command: if isinstance(i, build.Executable): |