From: Daniel Wagner Date: Wed, 22 Dec 2021 09:37:10 +0000 (+0100) Subject: build: Use _dep postfix for dependency objects X-Git-Tag: v2.0-rc0~13^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=285832ac210767b4cbeef13fc995a4e8a80241ca;p=users%2Fsagi%2Fnvme-cli.git build: Use _dep postfix for dependency objects Use consistently _dep postfix for all dependency objects. Signed-off-by: Daniel Wagner --- diff --git a/meson.build b/meson.build index c7382992..9eda18b1 100644 --- a/meson.build +++ b/meson.build @@ -32,14 +32,14 @@ conf = configuration_data() libnvme_dep = dependency('libnvme', fallback : ['libnvme', 'libnvme_dep']) # Check for libuuid availability -libuuid = dependency('uuid', required: true) -conf.set('CONFIG_LIBUUID', libuuid.found(), description: 'Is libuuid available?') +libuuid_dep = dependency('uuid', required: true) +conf.set('CONFIG_LIBUUID', libuuid_dep.found(), description: 'Is libuuid available?') # Check for libjson-c availability -json_c = dependency('json-c', version: '>=0.13', fallback : ['json-c', 'json_c_dep']) -if json_c.found() +json_c_dep = dependency('json-c', version: '>=0.13', fallback : ['json-c', 'json_c_dep']) +if json_c_dep.found() conf.set('CONFIG_JSONC', true, description: 'Is json-c available?') - conf.set('CONFIG_JSONC_14', json_c.version().version_compare('>=0.14'), description: 'Is json-c at least 0.14?') + conf.set('CONFIG_JSONC_14', json_c_dep.version().version_compare('>=0.14'), description: 'Is json-c at least 0.14?') endif # Check for libhugetlbfs availability @@ -193,7 +193,7 @@ subdir('Documentation') executable( 'nvme', sources, - dependencies: [ libnvme_dep, libuuid, json_c, libz_dep, openssl_dep, + dependencies: [ libnvme_dep, libuuid_dep, json_c_dep, libz_dep, openssl_dep, libhugetlbfs_dep ], include_directories: incdir, install: true,