From a42fbbf5d82af5b9f7cd34d207981581d5008058 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Fri, 14 Apr 2023 09:45:03 +0200 Subject: [PATCH] build: Extend summary section List also the dependencies and the user configuration in the summary. Signed-off-by: Daniel Wagner --- meson.build | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 369d5bd4..43ce5f9b 100644 --- a/meson.build +++ b/meson.build @@ -70,12 +70,10 @@ conf.set('CONFIG_JSONC', json_c_dep.found(), description: 'Is json-c available?' if cc.has_header('hugetlbfs.h') libhugetlbfs_dep = cc.find_library('hugetlbfs', required : false) - have_libhugetlbfs = libhugetlbfs_dep.found() else - libhugetlbfs_dep = [] - have_libhugetlbfs = false + libhugetlbfs_dep = dependency('', required: false) endif -conf.set('CONFIG_LIBHUGETLBFS', have_libhugetlbfs, description: 'Is libhugetlbfs available?') +conf.set('CONFIG_LIBHUGETLBFS', libhugetlbfs_dep.found(), description: 'Is libhugetlbfs available?') # Set the nvme-cli version conf.set('NVME_VERSION', '"' + meson.project_version() + '"') @@ -304,7 +302,7 @@ install_data(disc, ################################################################################ if meson.version().version_compare('>=0.53.0') - summary_dict = { + path_dict = { 'prefixdir': prefixdir, 'sysconfdir': sysconfdir, 'sbindir': sbindir, @@ -315,5 +313,14 @@ if meson.version().version_compare('>=0.53.0') 'systemddir': systemddir, 'build location': meson.current_build_dir(), } - summary(summary_dict) + summary(path_dict, section: 'Paths') + dep_dict = { + 'json-c': json_c_dep.found(), + 'libhugetlbfs': libhugetlbfs_dep.found(), + } + summary(dep_dict, section: 'Dependencies') + conf_dict = { + 'pdc enabled': get_option('pdc-enabled') + } + summary(conf_dict, section: 'Configuration') endif -- 2.50.1