Commit 051c9ada authored by Philip Withnall's avatar Philip Withnall

Merge branch 'glib-as-subproject' into 'master'

Meson: Add missing include_directories when using glib as subproject

See merge request !491
parents 4326d5e2 93555577
Pipeline #42694 failed with stages
in 8 minutes and 22 seconds
......@@ -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
......
......@@ -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])
......@@ -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',
......
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