diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-31 19:11:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-31 19:11:57 +0200 |
| commit | dd3f49af0d8c94033e6db68b25c23ea9e63e9c5c (patch) | |
| tree | cfae667dcb4b0ad3266d47134354636a1f3ba059 /mesonbuild/dependencies/misc.py | |
| parent | 500c39cb07d21aa6857e204f6689d324afd758c4 (diff) | |
| parent | 68eedc8b7157190a010d31bea81f13f91144ea75 (diff) | |
| download | meson-dd3f49af0d8c94033e6db68b25c23ea9e63e9c5c.zip meson-dd3f49af0d8c94033e6db68b25c23ea9e63e9c5c.tar.gz meson-dd3f49af0d8c94033e6db68b25c23ea9e63e9c5c.tar.bz2 | |
Merge pull request #2757 from xclaesse/pkgconfig
pkgconfig: Allow passing Dependency objects to library(_private)
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 7ceda3e..ea0711f 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -429,6 +429,7 @@ class MPIDependency(ExternalDependency): self.link_args = pkgdep.get_link_args() self.version = pkgdep.get_version() self.is_found = True + self.pcdep = pkgdep break except Exception: pass @@ -630,6 +631,7 @@ class Python3Dependency(ExternalDependency): self.link_args = self.pkgdep.get_link_args() self.version = self.pkgdep.get_version() self.is_found = True + self.pcdep = self.pkgdep return else: self.pkgdep = None @@ -763,6 +765,7 @@ class PcapDependency(ExternalDependency): self.compile_args = pcdep.get_compile_args() self.link_args = pcdep.get_link_args() self.version = pcdep.get_version() + self.pcdep = pcdep return except Exception as e: mlog.debug('Pcap not found via pkgconfig. Trying next, error was:', str(e)) @@ -805,6 +808,7 @@ class CupsDependency(ExternalDependency): self.compile_args = pcdep.get_compile_args() self.link_args = pcdep.get_link_args() self.version = pcdep.get_version() + self.pcdep = pcdep return except Exception as e: mlog.debug('cups not found via pkgconfig. Trying next, error was:', str(e)) @@ -854,6 +858,7 @@ class LibWmfDependency(ExternalDependency): self.compile_args = pcdep.get_compile_args() self.link_args = pcdep.get_link_args() self.version = pcdep.get_version() + self.pcdep = pcdep return except Exception as e: mlog.debug('LibWmf not found via pkgconfig. Trying next, error was:', str(e)) |