Merging upstream version 1.10.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
05578a6ab9
commit
a02d194ad0
946 changed files with 4401 additions and 1290 deletions
|
@ -8,7 +8,7 @@
|
|||
project(
|
||||
'libnvme', ['c'],
|
||||
meson_version: '>= 0.50.0',
|
||||
version: '1.9',
|
||||
version: '1.10',
|
||||
license: 'LGPL-2.1-or-later',
|
||||
default_options: [
|
||||
'c_std=gnu99',
|
||||
|
@ -46,7 +46,7 @@ conf = configuration_data()
|
|||
|
||||
version_tag = get_option('version-tag')
|
||||
if version_tag != ''
|
||||
conf.set('GIT_VERSION', '"@0@"'.format(version_tag))
|
||||
conf.set('GIT_VERSION', '"@0@"'.format(version_tag))
|
||||
else
|
||||
r = run_command('scripts/meson-vcs-tag.sh',
|
||||
meson.current_source_dir(),
|
||||
|
@ -306,4 +306,8 @@ if meson.version().version_compare('>=0.53.0')
|
|||
'Python 3': py3_dep.found(),
|
||||
}
|
||||
summary(dep_dict, section: 'Dependencies')
|
||||
conf_dict = {
|
||||
'git version': conf.get('GIT_VERSION'),
|
||||
}
|
||||
summary(conf_dict, section: 'Configuration')
|
||||
endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue