aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-10-15 09:56:37 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2020-10-17 22:25:57 +0300
commita050db5e306aa01cdc7ace561e6d53b1220a3a32 (patch)
treea8923b96b511ab228587fe7a4c10c045b687a94b /test cases
parent0c95d92404cfc5cebb32c886484946a8a42f6e79 (diff)
downloadmeson-a050db5e306aa01cdc7ace561e6d53b1220a3a32.zip
meson-a050db5e306aa01cdc7ace561e6d53b1220a3a32.tar.gz
meson-a050db5e306aa01cdc7ace561e6d53b1220a3a32.tar.bz2
Fix gnome.compile_resources() when glib is a subproject
When glib is a subproject we should use glib-compile-resources it overrides using find_program() in the case it is not installed on the build machine. With old glib version we have to run glib-compile-resources at configure time to generate the list of dependencies, but not when glib is recent enough.
Diffstat (limited to 'test cases')
-rw-r--r--test cases/failing/105 no glib-compile-resources/test.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/test cases/failing/105 no glib-compile-resources/test.json b/test cases/failing/105 no glib-compile-resources/test.json
index 67dc7e4..4bc7d90 100644
--- a/test cases/failing/105 no glib-compile-resources/test.json
+++ b/test cases/failing/105 no glib-compile-resources/test.json
@@ -1,7 +1,7 @@
{
"stdout": [
{
- "line": "test cases/failing/105 no glib-compile-resources/meson.build:8:0: ERROR: Could not execute glib-compile-resources."
+ "line": "test cases/failing/105 no glib-compile-resources/meson.build:8:0: ERROR: Program 'glib-compile-resources' not found"
}
]
}