aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-03-23 23:57:46 +0300
committerIgor Gnatenko <i.gnatenko.brain@gmail.com>2015-03-23 23:57:46 +0300
commit3be7297de8d6c72b36911e0108759d2b66df77f6 (patch)
tree30677eb3224599ab5c36c3f2b6b01ac722486362 /modules
parent85132e894860b54c39f29c1491e353a12decc5f6 (diff)
downloadmeson-3be7297de8d6c72b36911e0108759d2b66df77f6.zip
meson-3be7297de8d6c72b36911e0108759d2b66df77f6.tar.gz
meson-3be7297de8d6c72b36911e0108759d2b66df77f6.tar.bz2
modules/gnome: add support for multiple include for Gir. Closes #69
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to 'modules')
-rw-r--r--modules/gnome.py12
1 files changed, 10 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}