diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-10-04 12:52:55 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-10-04 12:52:55 +0000 |
| commit | 0ae798642ebd8f20455a0ddf2e2a0ff577048a0b (patch) | |
| tree | e62871fd0468f48afa72b6d23fb7fbadf3705d49 /meson.build | |
| parent | Releasing debian version 2.5-1. (diff) | |
| download | nvme-cli-0ae798642ebd8f20455a0ddf2e2a0ff577048a0b.tar.xz nvme-cli-0ae798642ebd8f20455a0ddf2e2a0ff577048a0b.zip | |
Merging upstream version 2.6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meson.build b/meson.build index af79bd4..3d3fb08 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( 'nvme-cli', ['c'], meson_version: '>= 0.50.0', license: 'GPL-2.0-only', - version: '2.5', + version: '2.6', default_options: [ 'c_std=gnu99', 'buildtype=debug', @@ -48,7 +48,7 @@ conf.set('SYSCONFDIR', '"@0@"'.format(sysconfdir)) conf.set('RUNDIR', '"@0@"'.format(rundir)) # Check for libnvme availability -libnvme_dep = dependency('libnvme', version: '>=1.5', required: true, +libnvme_dep = dependency('libnvme', version: '>=1.6', required: true, fallback : ['libnvme', 'libnvme_dep']) libnvme_mi_dep = dependency('libnvme-mi', required: true, fallback : ['libnvme', 'libnvme_mi_dep']) @@ -157,6 +157,11 @@ conf.set10( ), description: 'Is sys/random.h(getrandom) include-able?' ) +conf.set10( + 'HAVE_ATTRIBUTE_UNUSED', + cc.get_id() == 'clang', + description: 'Is compiler warning about unused static line function?' +) if cc.has_function_attribute('fallthrough') conf.set('fallthrough', '__attribute__((__fallthrough__))') |