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

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

Browse Source 
Meson: Add missing include_directories when using glib as subproject

See merge request GNOME/glib!491
This commit is contained in:
Philip Withnall 2018-11-26 14:29:24 +00:00
commit 051c9ada8e
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,
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

2
gmodule/meson.build
View File

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

2
gobject/meson.build
View File

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