aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2016-11-22 16:49:02 +0100
committerMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2016-12-05 10:57:10 +0100
commitbb3b45a0ececcb81e7049a09f041506f8de121fa (patch)
tree8dea6c40121b8bf219c764a1a59f0ae8dbd1b166
parent6d1b6de6b01f9fa06ef2c374aacb69b38cf2bd1b (diff)
downloadmeson-bb3b45a0ececcb81e7049a09f041506f8de121fa.zip
meson-bb3b45a0ececcb81e7049a09f041506f8de121fa.tar.gz
meson-bb3b45a0ececcb81e7049a09f041506f8de121fa.tar.bz2
gnome: use PkgConfigDependency to find gobject-introspection cflags
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-rw-r--r--mesonbuild/modules/gnome.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 241a531..4b61de1 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -371,14 +371,15 @@ can not be used with the current version of glib-compiled-resources, due to
if not isinstance(girtarget, (build.Executable, build.SharedLibrary)):
raise MesonException('Gir target must be an executable or shared library')
try:
- pkgstr = subprocess.check_output(['pkg-config', '--cflags', 'gobject-introspection-1.0'])
+ gir_dep = dependencies.PkgConfigDependency(
+ 'gobject-introspection-1.0', state.environment, {'native': True})
+ pkgargs = gir_dep.get_compile_args()
except Exception:
global girwarning_printed
if not girwarning_printed:
mlog.warning('gobject-introspection dependency was not found, disabling gir generation.')
girwarning_printed = True
return []
- pkgargs = pkgstr.decode().strip().split()
ns = kwargs.pop('namespace')
nsversion = kwargs.pop('nsversion')
libsources = kwargs.pop('sources')