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/modules | |
| 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/modules')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 55f1de0..adb6fa8 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1001,7 +1001,7 @@ class GnomeModule(ExtensionModule): target.get_subdir()) outdir = os.path.join(state.environment.get_build_dir(), target.get_subdir()) - outfile = target.output[0][:-5] # Strip .vapi + outfile = target.get_outputs()[0][:-5] # Strip .vapi ret.append('--vapidir=' + outdir) ret.append('--girdir=' + outdir) ret.append('--pkg=' + outfile) @@ -1068,7 +1068,7 @@ class GnomeModule(ExtensionModule): link_with += self._get_vapi_link_with(i.held_object) subdir = os.path.join(state.environment.get_build_dir(), i.held_object.get_subdir()) - gir_file = os.path.join(subdir, i.held_object.output[0]) + gir_file = os.path.join(subdir, i.held_object.get_outputs()[0]) cmd.append(gir_file) else: raise MesonException('Input must be a str or GirTarget') diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index e46c239..e79371f 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -76,8 +76,9 @@ class PkgConfigModule(ExtensionModule): if isinstance(l, str): yield l else: - if l.custom_install_dir: - yield '-L${prefix}/%s ' % l.custom_install_dir + install_dir = l.get_custom_install_dir()[0] + if install_dir: + yield '-L${prefix}/%s ' % install_dir else: yield '-L${libdir}' lname = self._get_lname(l, msg, pcfile) |