luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'valgrind-variable' into 'main'

Browse Source 
meson: Add glib_valgrind_suppressions variable to glib pkg-config file

See merge request GNOME/glib!3361
This commit is contained in:
Marco Trevisan
2023-04-17 12:52:28 +00:00
parent 7c1ef5c9ec c2e46b3789
commit 9f111c3416
8 changed files with 181 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gio/meson.build
View File

@@ -875,18 +875,20 @@ libgio_dep = declare_dependency(link_with : libgio,
pkg.generate(libgio,
requires : ['glib-2.0', 'gobject-2.0'],
variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
'giomoduledir=' + pkgconfig_giomodulesdir,
'gio=' + join_paths('${bindir}', 'gio'),
'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'),
'glib_compile_schemas=@0@'.format(pkgconfig_multiarch_bindir / 'glib-compile-schemas'),
'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
'gdbus=' + join_paths('${bindir}', 'gdbus'),
'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'),
'gresource=' + join_paths('${bindir}', 'gresource'),
'gsettings=' + join_paths('${bindir}', 'gsettings')],
variables : [
'datadir=' + '${prefix}' / get_option('datadir'),
'schemasdir=' + '${datadir}' / schemas_subdir,
'bindir=' + '${prefix}' / get_option('bindir'),
'giomoduledir=' + pkgconfig_giomodulesdir,
'gio=' + '${bindir}' / 'gio',
'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules',
'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas',
'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources',
'gdbus=' + '${bindir}' /'gdbus',
'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen',
'gresource=' + '${bindir}' / 'gresource',
'gsettings=' + '${bindir}' / 'gsettings',
],
version : glib_version,
install_dir : glib_pkgconfigreldir,
filebase : 'gio-2.0',