[gimp/wip/jtojnar/meson-dist: 3/3] meson: Fix build from tarball




commit 1b85f357171171ac655155a5c79e2414d463c9fd
Author: Jan Tojnar <jtojnar gmail com>
Date:   Fri Feb 25 18:40:31 2022 +0100

    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']
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]