From bf68e722766ff0c40bd6bf73953c282c0efe4a44 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 24 Nov 2020 21:04:37 +0000 Subject: meson: test: Simplify top level meson Utilise the subdir_done() functionality as is used with other optional components to simplify the top level meson file. Suggested-by: Jacopo Mondi Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- meson.build | 5 +---- test/meson.build | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 55cf36e1..c47eb420 100644 --- a/meson.build +++ b/meson.build @@ -121,10 +121,7 @@ subdir('src') # through configuration values. They are enabled by default. subdir('Documentation') - -if get_option('test') - subdir('test') -endif +subdir('test') if not meson.is_cross_build() kernel_version_req = '>= 5.0.0' diff --git a/test/meson.build b/test/meson.build index 0a1d434e..7f0682ad 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,5 +1,9 @@ # SPDX-License-Identifier: CC0-1.0 +if not get_option('test') + subdir_done() +endif + subdir('libtest') subdir('camera') -- cgit v1.2.1