aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/ui.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-12-03 22:53:44 +0200
committerGitHub <noreply@github.com>2017-12-03 22:53:44 +0200
commit018deb48feee88a1de73f8bcaea4d944dade7827 (patch)
tree684c53ed5a3938ddb5eaa00e6731b6e5a0aba350 /mesonbuild/dependencies/ui.py
parent312bc2ca810e333e7d8dd42e55ae9bd348757a07 (diff)
parentf8aab2f011afc93767a487cb68e856e21f9786d8 (diff)
downloadmeson-018deb48feee88a1de73f8bcaea4d944dade7827.zip
meson-018deb48feee88a1de73f8bcaea4d944dade7827.tar.gz
meson-018deb48feee88a1de73f8bcaea4d944dade7827.tar.bz2
Merge pull request #2663 from inigomartinez/pkg-config-define-variable
dependencies: Allow pkg-config to define variables
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
-rw-r--r--mesonbuild/dependencies/ui.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index bf74029..1db518c 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -239,7 +239,7 @@ class QtBaseDependency(ExternalDependency):
self.bindir = self.get_pkgconfig_host_bins(core)
if not self.bindir:
# If exec_prefix is not defined, the pkg-config file is broken
- prefix = core.get_pkgconfig_variable('exec_prefix')
+ prefix = core.get_pkgconfig_variable('exec_prefix', {})
if prefix:
self.bindir = os.path.join(prefix, 'bin')
@@ -359,7 +359,7 @@ class Qt4Dependency(QtBaseDependency):
applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
for application in applications:
try:
- return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application))
+ return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {}))
except MesonException:
pass
@@ -369,7 +369,7 @@ class Qt5Dependency(QtBaseDependency):
QtBaseDependency.__init__(self, 'qt5', env, kwargs)
def get_pkgconfig_host_bins(self, core):
- return core.get_pkgconfig_variable('host_bins')
+ return core.get_pkgconfig_variable('host_bins', {})
# There are three different ways of depending on SDL2: