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

Merge branch 'meson-dep' into 'master'

Browse Source 
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
commit bdc9328bdf
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/meson.build
View File

@ -855,9 +855,8 @@ else
endif endif
libgio_dep = declare_dependency(link_with : libgio, libgio_dep = declare_dependency(link_with : libgio,
dependencies : [gioenumtypes_dep], dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep],
# We sadly need to export configinc here because everyone includes <gio/*.h> include_directories : [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

3
gmodule/meson.build
View File

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

3
gobject/meson.build
View File

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