Meson: Cleanup unit test modules

diff --git a/meson.build b/meson.build
index 1f22b593f366304c1d0d452aeb4e17421bb1381a..fffd80aff8dfb85c09d4662ba3879df00a69b958 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -197,6 +197,8 @@ deps = [
   dep_boost,
   dep_boost_program_options,
   dep_gss_tsig,
+  dep_unittests,
+  dep_backend_unittests,
   dep_pkcs11,
   dep_yahttp,
   dep_json11,

diff --git a/meson/auth-backend-unit-tests/meson.build b/meson/auth-backend-unit-tests/meson.build
index 94f5614ca23d0a869a15ae780394cc8684a81b25..4ddf0b5125c27a7cb420e05e66732c3accac43f3 100644 (file)
--- a/meson/auth-backend-unit-tests/meson.build
+++ b/meson/auth-backend-unit-tests/meson.build
@@ -1,10 +1,14 @@
-# Auth Backend Unit Tests
-# Inputs: conf deps
-
 opt_backend_unittests = get_option('unit-tests-backends')
-dep_boost_test = dependency('boost', modules: ['unit_test_framework'], required: opt_backend_unittests)
-deps += dep_boost_test
-conf.set10('BACKEND_UNIT_TESTS', opt_backend_unittests, description: 'Whether backend unit tests are enabled')
-if not opt_unittests
-  summary('Test', dep_boost_test.found(), bool_yn: true, section: 'Boost')
+dep_backend_unittests = dependency('', required: false)
+
+conf.set('BACKEND_UNIT_TESTS', opt_backend_unittests, description: 'Backend unit tests')
+
+if opt_backend_unittests
+  dep_boost_test = dependency('boost', modules: ['unit_test_framework'], required: true)
+
+  if not dep_unittests.found()
+    summary('Test', dep_boost_test.found(), bool_yn: true, section: 'Boost')
+  endif
+
+  dep_backend_unittests = declare_dependency(dependencies: dep_boost_test)
 endif

diff --git a/meson/unit-tests/meson.build b/meson/unit-tests/meson.build
index bacb14f59678eac13201bb3f9e4646ef88fba6dd..8538401c97ae00aae4afa75bfb6cc6a2b1c94a3a 100644 (file)
--- a/meson/unit-tests/meson.build
+++ b/meson/unit-tests/meson.build
@@ -1,11 +1,10 @@
-# Unit Tests
-# Inputs: conf deps
-# Outputs: opt_unittests
-
 opt_unittests = get_option('unit-tests')
-dep_boost_test = dependency('boost', modules: ['unit_test_framework'], required: opt_unittests)
-deps += dep_boost_test
-conf.set10('UNIT_TESTS', opt_unittests, description: 'Whether unit tests are enabled')
+dep_unittests = dependency('', required: false)
+
+conf.set('UNIT_TESTS', opt_unittests, description: 'Unit tests')
+
 if opt_unittests
+  dep_boost_test = dependency('boost', modules: ['unit_test_framework'], required: true)
   summary('Test', dep_boost_test.found(), bool_yn: true, section: 'Boost')
+  dep_unittests = declare_dependency(dependencies: dep_boost_test)
 endif