From 12be4b66440bc9cea37519647731f26c337004d7 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Thu, 20 Jul 2017 14:38:44 -0400 Subject: [PATCH] gnome: Fix wrong include path When dealing with the SharedLibrary or StaticLibrary include directories, we where not taking into acount that path are relative to the source tree. With proper helper, this works now. This fixues issue where the gir may be generated bug from headers found in the prefix. --- mesonbuild/modules/gnome.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index dd4ca5077..883799cfe 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -376,9 +376,7 @@ class GnomeModule(ExtensionModule): if girdir: gi_includes.update([girdir]) elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): - for incd in dep.get_include_dirs(): - for idir in incd.get_incdirs(): - cflags.update(["-I%s" % idir]) + cflags.update(get_include_args(dep.get_include_dirs())) else: mlog.log('dependency %s not handled to build gir files' % dep) continue