From 34a873e31d2b2ee5c5a00b93bb745ce0573b801d Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 29 Jan 2021 12:10:03 -0500 Subject: 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', -- cgit v1.2.1 From f359d6150a5a63cb10dd7f64fa6e33229a1183be Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 29 Jan 2021 12:21:29 -0500 Subject: Meson: Disable tests that needs resources on Windows To be working on Windows we need to fix meson gnome module first: https://github.com/mesonbuild/meson/issues/8266. --- tests/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 8475f5f5c..53ae0fb38 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,6 +1,10 @@ # Resources contain PNG and BMP files, so we need these two loaders # enabled in order to build them -if enabled_loaders.contains('png') +# FIXME: On Windows glib-compile-resources will fail to execute +# gdk-pixbuf-pixdata from build directory because it needs all DLL locations in +# $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with +# this problem: See https://github.com/mesonbuild/meson/issues/8266. +if enabled_loaders.contains('png') and host_system != 'windows' # Resources; we cannot use gnome.compile_resources() here, because we need to # override the environment in order to use the utilities we just built instead # of the system ones -- cgit v1.2.1