luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Meson: Add missing include_directories when using glib as subproject

Browse Source 
When using glib as subproject we are forced to pass glib_dep,
gobject_dep and gio_dep to any build target. If we pass only gio_dep it
will missing include directory for glib and gobject.
This commit is contained in:
Xavier Claessens 2018-11-24 18:08:56 -05:00
parent 71bbe9f3e0
commit 93555577c5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/meson.build
View File

@ -857,7 +857,7 @@ endif
libgio_dep = declare_dependency(link_with : libgio, libgio_dep = declare_dependency(link_with : libgio,
dependencies : [gioenumtypes_dep], dependencies : [gioenumtypes_dep],
# We sadly need to export configinc here because everyone includes <gio/*.h> # 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' if host_system == 'windows'
# Hack till https://github.com/mesonbuild/meson/issues/2324 is fixed # Hack till https://github.com/mesonbuild/meson/issues/2324 is fixed

2
gmodule/meson.build
View File

@ -140,4 +140,4 @@ pkg.generate(libraries : [libgmodule, export_dynamic_ldflags],
) )
libgmodule_dep = declare_dependency(link_with : libgmodule, libgmodule_dep = declare_dependency(link_with : libgmodule,
include_directories : gmoduleinc) include_directories : [configinc, gmoduleinc, glibinc])

2
gobject/meson.build
View File

@ -84,7 +84,7 @@ pkg.generate(libraries : libgobject,
) )
libgobject_dep = declare_dependency(link_with : libgobject, libgobject_dep = declare_dependency(link_with : libgobject,
include_directories : gobjectinc) include_directories : [configinc, glibinc, gobjectinc])
python_tools = [ python_tools = [
'glib-genmarshal', 'glib-genmarshal',