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.
pull/2104/head
Nicolas Dufresne 7 years ago committed by Jussi Pakkanen
parent 67f0a1a44d
commit 12be4b6644
  1. 4
      mesonbuild/modules/gnome.py

@ -376,9 +376,7 @@ class GnomeModule(ExtensionModule):
if girdir: if girdir:
gi_includes.update([girdir]) gi_includes.update([girdir])
elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)):
for incd in dep.get_include_dirs(): cflags.update(get_include_args(dep.get_include_dirs()))
for idir in incd.get_incdirs():
cflags.update(["-I%s" % idir])
else: else:
mlog.log('dependency %s not handled to build gir files' % dep) mlog.log('dependency %s not handled to build gir files' % dep)
continue continue

Loading…
Cancel
Save