diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-03 22:53:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-03 22:53:44 +0200 |
| commit | 018deb48feee88a1de73f8bcaea4d944dade7827 (patch) | |
| tree | 684c53ed5a3938ddb5eaa00e6731b6e5a0aba350 /mesonbuild/modules/gnome.py | |
| parent | 312bc2ca810e333e7d8dd42e55ae9bd348757a07 (diff) | |
| parent | f8aab2f011afc93767a487cb68e856e21f9786d8 (diff) | |
| download | meson-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/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index f916c2c..56765a5 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -362,7 +362,7 @@ class GnomeModule(ExtensionModule): ldflags.update([lib]) if isinstance(dep, PkgConfigDependency): - girdir = dep.get_pkgconfig_variable("girdir") + girdir = dep.get_pkgconfig_variable("girdir", {}) if girdir: gi_includes.update([girdir]) elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): @@ -553,7 +553,7 @@ class GnomeModule(ExtensionModule): if subdir not in typelib_includes: typelib_includes.append(subdir) elif isinstance(dep, PkgConfigDependency): - girdir = dep.get_pkgconfig_variable("girdir") + girdir = dep.get_pkgconfig_variable("girdir", {}) if girdir and girdir not in typelib_includes: typelib_includes.append(girdir) # ldflags will be misinterpreted by gir scanner (showing |