diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-29 18:00:04 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-29 18:00:04 +0000 |
| commit | c0b6a54790b87ab4c954bed0d0635a6629a3533c (patch) | |
| tree | 42c0d409a6f05e57274389640b1f5a669da26216 | |
| parent | 4536d5f933679bdb81b5b7130eb02f5286dc449f (diff) | |
| parent | f359d6150a5a63cb10dd7f64fa6e33229a1183be (diff) | |
| download | gdk-pixbuf-c0b6a54790b87ab4c954bed0d0635a6629a3533c.tar.gz | |
Merge branch 'meson' into 'master'
Meson: Fix build on Windows
See merge request GNOME/gdk-pixbuf!102
| -rw-r--r-- | gdk-pixbuf/meson.build | 1 | ||||
| -rw-r--r-- | tests/meson.build | 6 | ||||
| -rw-r--r-- | thumbnailer/meson.build | 3 |
3 files changed, 8 insertions, 2 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/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 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', |