From afd3f3bedae461fc888e9251b900e6927ac0b276 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 7 Dec 2018 15:14:40 -0500 Subject: [PATCH] Meson: Fix declare_dependency() calls Turns out the fix in commit 93555577c wasn't enough, when using glib as subproject and the parent project uses only libgio_dep, and include , it won't find libintl.h because it's in the include_directories of libglib_dep. Fix that by declaring dependencies explicitly, which is the right thing to do since glib and gobject are public dependencies of gio. That reflects what we do for the pkg-config file as well. --- gio/meson.build | 5 ++--- gmodule/meson.build | 3 ++- gobject/meson.build | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gio/meson.build b/gio/meson.build index 30bdad06e..f06e54bf7 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -855,9 +855,8 @@ else endif libgio_dep = declare_dependency(link_with : libgio, - dependencies : [gioenumtypes_dep], - # We sadly need to export configinc here because everyone includes - include_directories : [configinc, glibinc, gobjectinc, gmoduleinc, gioinc]) + dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep], + include_directories : [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 20c7e3835..433c0d6c0 100644 --- a/gmodule/meson.build +++ b/gmodule/meson.build @@ -140,4 +140,5 @@ pkg.generate(libraries : [libgmodule, export_dynamic_ldflags], ) libgmodule_dep = declare_dependency(link_with : libgmodule, - include_directories : [configinc, gmoduleinc, glibinc]) + include_directories : [gmoduleinc], + dependencies : [libglib_dep]) diff --git a/gobject/meson.build b/gobject/meson.build index ad1f1e6ed..8d2fd0b54 100644 --- a/gobject/meson.build +++ b/gobject/meson.build @@ -84,7 +84,8 @@ pkg.generate(libraries : libgobject, ) libgobject_dep = declare_dependency(link_with : libgobject, - include_directories : [configinc, glibinc, gobjectinc]) + include_directories : [gobjectinc], + dependencies : [libglib_dep]) python_tools = [ 'glib-genmarshal',