Merge branch 'meson-dep' into 'master'

Meson: Fix declare_dependency() calls

See merge request GNOME/glib!518
This commit is contained in:
Xavier Claessens
2018-12-10 22:39:32 +00:00
3 changed files with 6 additions and 5 deletions

View File

@@ -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