[gdk-pixbuf/ebassi/for-master: 3/8] build: Use a dict for pkg-config file variables
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf/ebassi/for-master: 3/8] build: Use a dict for pkg-config file variables
- Date: Wed, 7 Apr 2021 17:09:21 +0000 (UTC)
commit f265a94336c17716b2dcb33198ec34ebf926f98e
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Apr 7 17:25:26 2021 +0100
build: Use a dict for pkg-config file variables
Avoids a ton of string manipulations, and leaves escaping to Meson.
gdk-pixbuf/meson.build | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index 2bbf4ca09..6c8d3190c 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -331,21 +331,23 @@ else
loaders_dep = declare_dependency()
endif
+pkg_variables = {
+ 'bindir': '${prefix}/@0@'.format(get_option('bindir')),
+ 'gdk_pixbuf_binary_version': gdk_pixbuf_binary_version,
+ 'gdk_pixbuf_binarydir': '${libdir}/@0@/@1@'.format(gdk_pixbuf_api_name, gdk_pixbuf_binary_version),
+ 'gdk_pixbuf_moduledir': '${gdk_pixbuf_binarydir}/loaders',
+ 'gdk_pixbuf_cache_file': '${gdk_pixbuf_binarydir}/loaders.cache',
+ 'gdk_pixbuf_csource': '${bindir}/gdk-pixbuf-csource',
+ 'gdk_pixbuf_pixdata': '${bindir}/gdk-pixbuf-pixdata',
+ 'gdk_pixbuf_query_loaders': '${bindir}/gdk-pixbuf-query-loaders',
+}
+
pkgconfig = import('pkgconfig')
pkgconfig.generate(
gdkpixbuf,
name: 'GdkPixbuf',
description: 'Image loading and scaling',
- variables: [
- 'bindir=${prefix}/@0@'.format(get_option('bindir')),
- 'gdk_pixbuf_binary_version=@0@'.format(gdk_pixbuf_binary_version),
- 'gdk_pixbuf_binarydir=${libdir}/@0@/@1@'.format(gdk_pixbuf_api_name, gdk_pixbuf_binary_version),
- 'gdk_pixbuf_moduledir=${gdk_pixbuf_binarydir}/loaders',
- 'gdk_pixbuf_cache_file=${gdk_pixbuf_binarydir}/loaders.cache',
- 'gdk_pixbuf_csource=${bindir}/gdk-pixbuf-csource',
- 'gdk_pixbuf_pixdata=${bindir}/gdk-pixbuf-pixdata',
- 'gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders',
- ],
+ variables: pkg_variables,
requires: 'gobject-2.0',
subdirs: gdk_pixbuf_api_name,
filebase: gdk_pixbuf_api_name,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]