[glib: 1/2] Meson: Add missing include_directories when using glib as subproject



commit 93555577c562d8908242aa5048d1bd518d63f461
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Sat Nov 24 18:08:56 2018 -0500

    Meson: Add missing include_directories when using glib as subproject
    
    When using glib as subproject we are forced to pass glib_dep,
    gobject_dep and gio_dep to any build target. If we pass only gio_dep it
    will missing include directory for glib and gobject.

 gio/meson.build     | 2 +-
 gmodule/meson.build | 2 +-
 gobject/meson.build | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gio/meson.build b/gio/meson.build
index ab3834586..30bdad06e 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -857,7 +857,7 @@ endif
 libgio_dep = declare_dependency(link_with : libgio,
   dependencies : [gioenumtypes_dep],
   # We sadly need to export configinc here because everyone includes <gio/*.h>
-  include_directories : [configinc, gioinc])
+  include_directories : [configinc, glibinc, gobjectinc, gmoduleinc, gioinc])
 
 if host_system == 'windows'
   # Hack till https://github.com/mesonbuild/meson/issues/2324 is fixed
diff --git a/gmodule/meson.build b/gmodule/meson.build
index 2c8a5ea20..20c7e3835 100644
--- a/gmodule/meson.build
+++ b/gmodule/meson.build
@@ -140,4 +140,4 @@ pkg.generate(libraries : [libgmodule, export_dynamic_ldflags],
 )
 
 libgmodule_dep = declare_dependency(link_with : libgmodule,
-  include_directories : gmoduleinc)
+  include_directories : [configinc, gmoduleinc, glibinc])
diff --git a/gobject/meson.build b/gobject/meson.build
index d426f12b4..ad1f1e6ed 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -84,7 +84,7 @@ pkg.generate(libraries : libgobject,
 )
 
 libgobject_dep = declare_dependency(link_with : libgobject,
-  include_directories : gobjectinc)
+  include_directories : [configinc, glibinc, gobjectinc])
 
 python_tools = [
   'glib-genmarshal',


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