diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-01-29 12:10:03 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2021-01-29 12:10:03 -0500 |
| commit | 34a873e31d2b2ee5c5a00b93bb745ce0573b801d (patch) | |
| tree | a16b50a82944c2ad6c2816c24b5e82d5906ad9d9 | |
| parent | 4536d5f933679bdb81b5b7130eb02f5286dc449f (diff) | |
| download | gdk-pixbuf-34a873e31d2b2ee5c5a00b93bb745ce0573b801d.tar.gz | |
Meson: Override programs
Meson's gnome module could want to find programs such as
gdk-pixbuf-pixdata when invoking glib-compile-resources.
| -rw-r--r-- | gdk-pixbuf/meson.build | 1 | ||||
| -rw-r--r-- | thumbnailer/meson.build | 3 |
2 files changed, 3 insertions, 1 deletions
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', |