[gdk-pixbuf: 1/3] Meson: Override programs
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf: 1/3] Meson: Override programs
- Date: Fri, 29 Jan 2021 18:00:05 +0000 (UTC)
commit 34a873e31d2b2ee5c5a00b93bb745ce0573b801d
Author: Xavier Claessens <xavier claessens collabora com>
Date: Fri Jan 29 12:10:03 2021 -0500
Meson: Override programs
Meson's gnome module could want to find programs such as
gdk-pixbuf-pixdata when invoking glib-compile-resources.
gdk-pixbuf/meson.build | 1 +
thumbnailer/meson.build | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index e89889c13..2bbf4ca09 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -307,6 +307,7 @@ foreach bin: gdkpixbuf_bin
include_directories: [ root_inc, gdk_pixbuf_inc ],
c_args: common_cflags + gdk_pixbuf_cflags,
install: true)
+ meson.override_find_program(bin_name, bin)
# Used in tests
set_variable(bin_name.underscorify(), bin)
diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build
index e80114491..b6a206d5b 100644
--- a/thumbnailer/meson.build
+++ b/thumbnailer/meson.build
@@ -1,4 +1,4 @@
-executable('gdk-pixbuf-thumbnailer',
+bin = executable('gdk-pixbuf-thumbnailer',
[ 'gdk-pixbuf-thumbnailer.c', 'gnome-thumbnailer-skeleton.c' ],
c_args: common_cflags + [
'-DTHUMBNAILER_RETURNS_PIXBUF',
@@ -6,6 +6,7 @@ executable('gdk-pixbuf-thumbnailer',
],
dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ],
install: true)
+meson.override_find_program('gdk-pixbuf-thumbnailer', bin)
gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types',
'gdk-pixbuf-print-mime-types.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]