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

Merge branch 'meson-gio-var' into 'main'

Browse Source 
meson: Add schemasdir and giomoduledir to gio dependency

See merge request GNOME/glib!2517
This commit is contained in:
Philip Withnall 2022-02-22 18:22:52 +00:00
commit 68dc5d5fbc
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gio/meson.build
View File

@ -819,9 +819,22 @@ endif
schemas_subdir = join_paths('glib-2.0', 'schemas') schemas_subdir = join_paths('glib-2.0', 'schemas')
# Work around variables kwarg requiring Meson 0.56
declare_dependency_kwargs = {}
if meson.version().version_compare('>=0.56.0')
declare_dependency_kwargs = {
'variables': [
'schemasdir=' + join_paths(glib_datadir, schemas_subdir),
'giomoduledir=' + glib_giomodulesdir,
]
}
endif
libgio_dep = declare_dependency(link_with : libgio, libgio_dep = declare_dependency(link_with : libgio,
dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep], dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep],
include_directories : [gioinc]) include_directories : [gioinc],
kwargs : declare_dependency_kwargs,
)
pkg.generate(libgio, pkg.generate(libgio,
requires : ['glib-2.0', 'gobject-2.0'], requires : ['glib-2.0', 'gobject-2.0'],