meson: correct some things

We can get source_root from meson, and doing [3]
can give you an out of bounds error in certain cases.

Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
worldofpeace 2019-05-18 22:40:39 -04:00 committed by Frediano Ziglio
parent 5ee2af0fe5
commit b4a6c1abcc
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@
# project definition
#
project('spice', 'c',
version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(),
version : run_command('build-aux/git-version-gen', meson.source_root() + '/.tarball-version', check : true).stdout().strip(),
license : 'LGPLv2.1',
meson_version : '>= 0.48')

View File

@ -7,7 +7,7 @@ version_info = meson.project_version().split('.')
major = '@0@'.format(version_info[0])
minor = '@0@'.format(version_info[1])
micro = version_info[2].to_int()
if not version_info[3].contains('git')
if not version_info.contains('git')
micro += 1
endif
micro = '@0@'.format(micro)