[Spice-commits] server/meson.build

[GitLab Mirror]

 server/meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37fd91a51f52cdc1b55d3ce41e6ce6db348b986c
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Wed Sep 30 10:38:42 2020 +0100

    build-sys: Fix computed version using Meson
    
    In configure.ac the micro version is incremented if there is a
    forth component in the version.
    In Meson this was wrongly translated to "if contains git".
    
    This fixes Gitlab issue #46.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
    Acked-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>

diff --git a/server/meson.build b/server/meson.build
index acb85f2f..4a670635 100644
--- a/server/meson.build
+++ b/server/meson.build
@@ -12,7 +12,7 @@ else
   major = '@0@'.format(version_info[0])
   minor = '@0@'.format(version_info[1])
   micro = version_info[2].to_int()
-  if not version_info.contains('git')
+  if version_info.length() >= 4
     micro += 1
   endif
   micro = '@0@'.format(micro)