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

Merge branch 'uninstalled_variables' into 'main'

Browse Source 
meson: Add variables to -uninstalled.pc files

See merge request GNOME/glib!4399
This commit is contained in:
Philip Withnall 2024-11-19 12:01:06 +00:00
commit dfe252429c
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/meson.build
View File

@ -915,6 +915,16 @@ pkg.generate(libgio,
'gresource=' + '${bindir}' / 'gresource', 'gresource=' + '${bindir}' / 'gresource',
'gsettings=' + '${bindir}' / 'gsettings', 'gsettings=' + '${bindir}' / 'gsettings',
], ],
uninstalled_variables : [
'gio=${prefix}/gio/gio',
'gio_querymodules=${prefix}/gio/gio-querymodules',
'glib_compile_schemas=${prefix}/gio/glib-compile-schemas',
'glib_compile_resources=${prefix}/gio/glib-compile-resources',
'gdbus=${prefix}/gio/gdbus',
'gdbus_codegen=${prefix}/gio/gdbus-2.0/codegen/gdbus-codegen',
'gresource=${prefix}/gio/gresource',
'gsettings=${prefix}/gio/gsettings',
],
version : glib_version, version : glib_version,
install_dir : glib_pkgconfigreldir, install_dir : glib_pkgconfigreldir,
filebase : 'gio-2.0', filebase : 'gio-2.0',

6
glib/meson.build
View File

@ -450,6 +450,12 @@ pkg.generate(libglib,
valgrind_suppression_file_install_subdir / valgrind_suppression_file_install_subdir /
fs.name(valgrind_suppression_file), fs.name(valgrind_suppression_file),
], ],
uninstalled_variables : [
'glib_genmarshal=${prefix}/gobject/glib-genmarshal',
'gobject_query=${prefix}/gobject/gobject-query',
'glib_mkenums=${prefix}/gobject/glib-mkenums',
'glib_valgrind_suppressions=' + valgrind_suppression_file.full_path(),
],
version : glib_version, version : glib_version,
install_dir : glib_pkgconfigreldir, install_dir : glib_pkgconfigreldir,
filebase : 'glib-2.0', filebase : 'glib-2.0',