From e4cbfab5aeb48a3fd8ba820ba5743098dd2be13e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Feb 2022 18:40:31 +0100 Subject: [PATCH] meson: Fix build from tarball Since https://gitlab.gnome.org/GNOME/gimp/-/commit/2afa019c708869ef84a2d24c96552b380a504d4d, the Meson configure step will fail when building from tarball (missing `.git` and `gitversion.h` is present) because `gitversion_h` variable will contain a `list[file]` but `custom_target` does not like that in its `depends` kwarg. --- build/windows/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/windows/meson.build b/build/windows/meson.build index c59fbd5581..8df68256f6 100644 --- a/build/windows/meson.build +++ b/build/windows/meson.build @@ -22,7 +22,7 @@ gimp_plugins_rc = custom_target('gimp_plugins_rc', build_by_default: true, build_always_stale: true, command: [python, '-c', 'exit()'], - depends: [gitversion_h], + depends: generate_version_h ? [gitversion_h] : [], output: ['gimp-plug-ins.rc'] ) @@ -30,6 +30,6 @@ gimp_app_rc = custom_target('gimp_app_rc', build_by_default: true, build_always_stale: true, command: [python, '-c', 'exit()'], - depends: [gitversion_h], + depends: generate_version_h ? [gitversion_h] : [], output: ['gimp.rc'] )