diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-01-31 04:13:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-01-31 04:13:03 +0000 |
| commit | d2082ee94267e4ca59b187c5e37dac03c1d65187 (patch) | |
| tree | cd93a882e0726a7df500fedf2263263984406b36 /meson.build | |
| parent | Releasing debian version 2.2.1-4. (diff) | |
| download | nvme-cli-d2082ee94267e4ca59b187c5e37dac03c1d65187.tar.xz nvme-cli-d2082ee94267e4ca59b187c5e37dac03c1d65187.zip | |
Merging upstream version 2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/meson.build b/meson.build index cd85a98..c05dc47 100644 --- a/meson.build +++ b/meson.build @@ -2,13 +2,13 @@ ################################################################################ project( 'nvme-cli', ['c'], - meson_version: '>= 0.48.0', + meson_version: '>= 0.50.0', license: 'GPL-2.0-only', - version: '2.2.1', + version: '2.3', default_options: [ 'c_std=gnu99', - 'buildtype=release', - 'prefix=/usr', + 'buildtype=debug', + 'prefix=/usr/local', 'warning_level=1', ] ) @@ -44,7 +44,7 @@ endif conf.set('SYSCONFDIR', '"@0@"'.format(sysconfdir)) # Check for libnvme availability -libnvme_dep = dependency('libnvme', version: '>=1.2', required: true, +libnvme_dep = dependency('libnvme', version: '>=1.3', required: true, fallback : ['libnvme', 'libnvme_dep']) libnvme_mi_dep = dependency('libnvme-mi', required: true, fallback : ['libnvme', 'libnvme_mi_dep']) @@ -77,6 +77,8 @@ conf.set('CONFIG_LIBHUGETLBFS', have_libhugetlbfs, description: 'Is libhugetlbfs # Set the nvme-cli version conf.set('NVME_VERSION', '"' + meson.project_version() + '"') +conf.set10('DEFAULT_PDC_ENABLED', get_option('pdc-enabled')) + # local (cross-compilable) implementations of ccan configure steps conf.set10( 'HAVE_BUILTIN_TYPES_COMPATIBLE_P', @@ -249,7 +251,10 @@ sources = [ subdir('ccan') subdir('plugins') -subdir('tests') +subdir('unit') +if get_option('nvme-tests') + subdir('tests') +endif subdir('util') subdir('Documentation') |