Commit bdc9328b authored by Xavier Claessens's avatar Xavier Claessens

Merge branch 'meson-dep' into 'master'

Meson: Fix declare_dependency() calls

See merge request GNOME/glib!518
parents 3fadcf9f afd3f3be
Pipeline #45269 failed with stages
in 10 minutes and 50 seconds
......@@ -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
......
......@@ -141,4 +141,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(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