aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Müllner <fmuellner@gnome.org>2017-06-11 21:32:44 +0200
committerFlorian Müllner <fmuellner@gnome.org>2017-06-11 21:40:14 +0200
commit4b8dc3b7463fa2512d58ca3f65f8eaddfd126ff5 (patch)
tree6032c913375a796061b9f27d36868f4b64dbc070
parentf792641b34a83d61a421f0d76a8c72a956bdb073 (diff)
downloadmeson-4b8dc3b7463fa2512d58ca3f65f8eaddfd126ff5.zip
meson-4b8dc3b7463fa2512d58ca3f65f8eaddfd126ff5.tar.gz
meson-4b8dc3b7463fa2512d58ca3f65f8eaddfd126ff5.tar.bz2
gnome: Fix includedir cflags
Include directories are passed with the -I flag to both the compiler and g-ir-scanner, not as input files.
-rw-r--r--mesonbuild/modules/gnome.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 6cc1e5d..e873084 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -367,7 +367,8 @@ class GnomeModule(ExtensionModule):
gi_includes.update([girdir])
elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)):
for incd in dep.get_include_dirs():
- cflags.update(incd.get_incdirs())
+ for idir in incd.get_incdirs():
+ cflags.update(["-I%s" % idir])
else:
mlog.log('dependency %s not handled to build gir files' % dep)
continue