Commit afd3f3be authored by Xavier Claessens's avatar Xavier Claessens

Meson: Fix declare_dependency() calls

Turns out the fix in commit 93555577 wasn't enough, when using glib as
subproject and the parent project uses only libgio_dep, and include
<gi18n.h>, 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.
parent fa80a2d1
......@@ -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 <gio/*.h>
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
......
......@@ -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])
......@@ -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',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment