[gtk+] build: Ensure introspection data points to the right header



commit 3cb8a976a6adc7dd7fe4fef777fa7b5a4323756b
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Aug 15 17:13:30 2017 +0100

    build: Ensure introspection data points to the right header
    
    We have different header files for different sections of our API,
    including introspection.

 gtk/meson.build |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 6bc4c3e..8b8b7a6 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -916,7 +916,6 @@ libgtk_dep = declare_dependency(sources: [gtkversion, gtktypebuiltins_h],
 # Introspection
 if not meson.is_cross_build()
   gir_args = [
-    '--c-include=gtk/gtk.h',
     '--quiet',
   ]
 
@@ -930,6 +929,7 @@ if not meson.is_cross_build()
                                includes: [ 'Gio-2.0', 'GdkPixbuf-2.0', 'Pango-1.0', 'cairo-1.0', ],
                                install: true,
                                extra_args: gir_args + [
+                                 '--c-include=gdk/gdk.h',
                                  '-DGDK_COMPILATION',
                                ])
   gdk_gir_dep = declare_dependency(sources: gdk_gir)
@@ -964,6 +964,7 @@ if not meson.is_cross_build()
                                install: true,
                                dependencies: gdk_gir_dep,
                                extra_args: gir_args + [
+                                 '--c-include=gsk/gsk.h',
                                  '--include-uninstalled=./gtk/Gdk-4.0.gir',
                                  '-DGSK_COMPILATION',
                                ])
@@ -985,6 +986,7 @@ if not meson.is_cross_build()
                      install: true,
                      dependencies: gsk_gir_dep,
                      extra_args: gir_args + [
+                       '--c-include=gtk/gtk.h',
                        '--include-uninstalled=./gtk/Gdk-4.0.gir',
                        '--include-uninstalled=./gtk/Gsk-4.0.gir',
                        '-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API',


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