[gdk-pixbuf: 2/3] Meson: Disable tests that needs resources on Windows
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf: 2/3] Meson: Disable tests that needs resources on Windows
- Date: Fri, 29 Jan 2021 18:00:05 +0000 (UTC)
commit f359d6150a5a63cb10dd7f64fa6e33229a1183be
Author: Xavier Claessens <xavier claessens collabora com>
Date: Fri Jan 29 12:21:29 2021 -0500
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]