diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-04-09 21:57:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-09 21:57:46 +0300 |
| commit | 1652dccea2c1c4729f74ae66c7af5e3decf3dc5b (patch) | |
| tree | 70e8aec9bcc1037ea406ab422c196cbbd792aaba /mesonbuild/backend/backends.py | |
| parent | 0e8eba7f644571ea0beb40334d2a3d0b150ac4ef (diff) | |
| parent | aa3480dabaaf8fe164ae9fa5115cc092277245f5 (diff) | |
| download | meson-1652dccea2c1c4729f74ae66c7af5e3decf3dc5b.zip meson-1652dccea2c1c4729f74ae66c7af5e3decf3dc5b.tar.gz meson-1652dccea2c1c4729f74ae66c7af5e3decf3dc5b.tar.bz2 | |
Merge pull request #1469 from centricular/install-secondary-outputs
Support multiple install dirs for built/custom targets
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index efc5bff..2e630bd 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -601,7 +601,7 @@ class Backend: for t in target.get_generated_sources(): if not isinstance(t, build.CustomTarget): continue - for f in t.output: + for f in t.get_outputs(): if self.environment.is_library(f): libs.append(os.path.join(self.get_target_dir(t), f)) return libs @@ -642,7 +642,7 @@ class Backend: build_root = self.environment.get_source_dir() outdir = os.path.join(self.environment.get_build_dir(), outdir) outputs = [] - for i in target.output: + for i in target.get_outputs(): outputs.append(os.path.join(outdir, i)) inputs = self.get_custom_target_sources(target) # Evaluate the command list |