Merge pull request #72 from ignatenkobrain/wip/gnome

modules/gnome: add support for multiple include for Gir. Closes #69

2 files changed, 11 insertions, 2 deletions

diff --git a/modules/gnome.py b/modules/gnome.py
index 565f971..bfae555 100644
--- a/modules/gnome.py
+++ b/modules/gnome.py
@@ -58,8 +58,16 @@ class GnomeModule:
         scan_name = girtarget.name + '-gir'
         scan_command = ['g-ir-scanner', '@INPUT@', '--program', girtarget]
         scan_command += pkgargs
-        scan_command += ['--include=GObject-2.0', '--namespace='+ns,
-                         '--nsversion=' + nsversion, '--output', '@OUTPUT@']
+        scan_command += ['--namespace='+ns, '--nsversion=' + nsversion,
+                         '--output', '@OUTPUT@']
+        if 'includes' in kwargs:
+            includes = kwargs.pop('includes')
+            if isinstance(includes, str):
+                scan_command += ['--include=%s' % includes]
+            elif isinstance(includes, list):
+                scan_command += ['--include=%s' % inc for inc in includes]
+            else:
+                raise MesonException('Gir includes must be str or list')
         scankwargs = {'output' : girfile,
                       'input' : libsources,
                       'command' : scan_command}
diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build
index cb3308e..f4b118d 100644
--- a/test cases/frameworks/7 gnome/gir/meson.build
+++ b/test cases/frameworks/7 gnome/gir/meson.build
@@ -8,6 +8,7 @@ gnome.generate_gir(girexe,
 sources : libsources,
 nsversion : '1.0',
 namespace : 'Meson',
+includes : ['GObject-2.0', 'Gio-2.0'],
 install : true
 )