[json-glib] build: Add missing argument to the introspection scanner



commit c1c04b0cfd3ebc8b4cf7299b6bf71a5149762330
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Mar 13 16:21:40 2017 +0000

    build: Add missing argument to the introspection scanner
    
    The autotools build specifies the include header with the --c-include
    argument for g-ir-scanner, so we need to do the same when building with
    Meson.

 json-glib/meson.build |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/json-glib/meson.build b/json-glib/meson.build
index d110f20..8dc466a 100644
--- a/json-glib/meson.build
+++ b/json-glib/meson.build
@@ -98,16 +98,22 @@ pkgg.generate(libraries: [ json_lib ],
 json_gen_headers = [ json_version_h, json_glib_enums.get(1), ]
 
 if build_gir
-    gnome.generate_gir(json_lib,
-                       sources: source_c + source_h + json_glib_enums + [ json_version_h ],
-                       namespace: 'Json',
-                       nsversion: apiversion,
-                       identifier_prefix: 'Json',
-                       symbol_prefix: 'json',
-                       export_packages: 'json-glib-1.0',
-                       includes: [ 'GObject-2.0', 'Gio-2.0', ],
-                       install: true,
-                       extra_args: ['-DJSON_COMPILATION'])
+  gir_args = [
+    '--c-include=json-glib/json-glib.h',
+    '-DJSON_COMPILATION',
+  ]
+
+
+  gnome.generate_gir(json_lib,
+                     sources: source_c + source_h + json_glib_enums + [ json_version_h ],
+                     namespace: 'Json',
+                     nsversion: apiversion,
+                     identifier_prefix: 'Json',
+                     symbol_prefix: 'json',
+                     export_packages: 'json-glib-1.0',
+                     includes: [ 'GObject-2.0', 'Gio-2.0', ],
+                     install: true,
+                     extra_args: gir_args)
 endif
 
 json_glib_dep = declare_dependency(link_with: json_lib,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]