From 17bbf70385563370849d7ea7ff599a63224ddbd5 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Wed, 16 Aug 2023 14:42:25 +0200 Subject: [PATCH] Meson: Cleanup boost modules --- meson.build | 2 ++ meson/boost-program-options/meson.build | 4 ---- meson/boost-serialization/meson.build | 7 ++----- meson/boost/meson.build | 12 ++++++------ 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index e14ec1fe87..1f22b593f3 100644 --- a/meson.build +++ b/meson.build @@ -194,6 +194,8 @@ deps = [ dep_libssl, dep_gnutls, dep_rt, + dep_boost, + dep_boost_program_options, dep_gss_tsig, dep_pkcs11, dep_yahttp, diff --git a/meson/boost-program-options/meson.build b/meson/boost-program-options/meson.build index 5b6b82cc2c..2b463546b7 100644 --- a/meson/boost-program-options/meson.build +++ b/meson/boost-program-options/meson.build @@ -1,6 +1,2 @@ -# Boost Program Options Library -# Inputs: deps - dep_boost_program_options = dependency('boost', modules: ['program_options'], required: true) -deps += dep_boost_program_options summary('Program Options', dep_boost_program_options.found(), bool_yn: true, section: 'Boost') diff --git a/meson/boost-serialization/meson.build b/meson/boost-serialization/meson.build index 346c8c9e20..e83b1c5341 100644 --- a/meson/boost-serialization/meson.build +++ b/meson/boost-serialization/meson.build @@ -1,5 +1,2 @@ -# Boost Serialization Library -# Outputs: deps_boost_serialization - -deps_boost_serialization = dependency('boost', modules: ['serialization'], required: true) -summary('Serialization', deps_boost_serialization.found(), bool_yn: true, section: 'Boost') +dep_boost_serialization = dependency('boost', modules: ['serialization'], required: true) +summary('Serialization', dep_boost_serialization.found(), bool_yn: true, section: 'Boost') diff --git a/meson/boost/meson.build b/meson/boost/meson.build index f8e15babe2..d8421990e8 100644 --- a/meson/boost/meson.build +++ b/meson/boost/meson.build @@ -1,10 +1,10 @@ -# Boost -# Inputs: conf deps - dep_boost = dependency('boost', version: '>= 1.42', required: true) -deps += dep_boost # Boost accumulators, as used by dnsbulktest and dnstcpbench, need 1.48+ to be compatible # with C++11. -conf.set10('HAVE_BOOST_GE_148', dep_boost.version().version_compare('>= 1.48.0'), description: 'Whether the boost version is >= 1.48.0') -summary('Boost', dep_boost.found(), bool_yn: true, section: 'Configuration') +conf.set( + 'HAVE_BOOST_GE_148', + dep_boost.version().version_compare('>= 1.48.0'), + description: 'Boost version >= 1.48.0', +) +summary('Boost', dep_boost.found(), bool_yn: true, section: 'Boost') summary('Version', dep_boost.version(), section: 'Boost') -- 2.47.2