diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2023-04-14 20:04:22 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2023-04-17 14:25:52 +0200 |
| commit | c2e46b37896a33bda1305694a47bf694b13bdf80 (patch) | |
| tree | b0c78cf9f592c3d554bceffea6dd31c039deb3a2 | |
| parent | ade79bcb5006c33d6f644cfe41d22d14728e585f (diff) | |
| download | glib-c2e46b37896a33bda1305694a47bf694b13bdf80.tar.gz | |
meson: cleanup pkg-config variables definitions
Use more readable and shorter syntax
| -rw-r--r-- | gio/meson.build | 26 | ||||
| -rw-r--r-- | glib/meson.build | 17 |
2 files changed, 23 insertions, 20 deletions
diff --git a/gio/meson.build b/gio/meson.build index 462606f3b..b056546ed 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -877,18 +877,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', diff --git a/glib/meson.build b/glib/meson.build index 71427012a..c62f94565 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -440,14 +440,15 @@ pkg.generate(libglib, libraries_private : [win32_ldflags], subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, - variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), - 'datadir=' + join_paths('${prefix}', get_option('datadir')), - 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), - 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), - 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums'), - 'glib_valgrind_suppressions=' + join_paths('${datadir}', - valgrind_suppression_file_install_subdir, - fs.name(valgrind_suppression_file)), + variables : [ + 'bindir=' + '${prefix}' / get_option('bindir'), + 'datadir=' + '${prefix}' / get_option('datadir'), + 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', + 'gobject_query=' + '${bindir}' / 'gobject-query', + 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', + 'glib_valgrind_suppressions=' + '${datadir}' / + valgrind_suppression_file_install_subdir / + fs.name(valgrind_suppression_file), ], version : glib_version, install_dir : glib_pkgconfigreldir, |