diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2017-07-20 14:38:44 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-21 20:16:50 +0300 |
| commit | 12be4b66440bc9cea37519647731f26c337004d7 (patch) | |
| tree | ab532e9114e97ede302edd8e3223e881772ebe1c | |
| parent | 67f0a1a44db7c7de4b37ac34b14ac866708ccbdb (diff) | |
| download | meson-12be4b66440bc9cea37519647731f26c337004d7.zip meson-12be4b66440bc9cea37519647731f26c337004d7.tar.gz meson-12be4b66440bc9cea37519647731f26c337004d7.tar.bz2 | |
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.
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index dd4ca50..883799c 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 |