[gdk-pixbuf/macos-ci] Skip resource tests with glib subproject
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf/macos-ci] Skip resource tests with glib subproject
- Date: Sun, 3 Jan 2021 21:45:01 +0000 (UTC)
commit 64ee4abcb81ed0f47cae2befb17dc868e4244310
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jan 3 16:44:36 2021 -0500
Skip resource tests with glib subproject
It doesn't work.
tests/meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/tests/meson.build b/tests/meson.build
index ab7ff1eee..464f8c4c9 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,9 +1,12 @@
# Resources contain PNG and BMP files, so we need these two loaders
# enabled in order to build them
-if enabled_loaders.contains('png')
+if glib_dep.type_name != 'internal' and enabled_loaders.contains('png')
# 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
+ # On the other hand, the gen_resources script does not work if
+ # we use glib as a subproject, since it won't find glib-compile-resources
+ # in the path
resources_c = custom_target('resources.c',
input: 'resources.gresource.xml',
output: 'resources.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]