[libcamera-devel] [PATCH 4/4] meson: test: Simplify top level meson
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Mon Dec 7 20:15:47 CET 2020
Hi Kieran,
Thank you for the patch.
On Mon, Dec 07, 2020 at 03:07:37PM +0000, Kieran Bingham wrote:
> Utilise the subdir_done() functionality as is used with other optional components
> to simplify the top level meson file.
>
> Suggested-by: Jacopo Mondi <jacopo at jmondi.org>
> Signed-off-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
> meson.build | 5 +----
> test/meson.build | 4 ++++
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 55cf36e15f57..c47eb420f4db 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 0a1d434e3996..7f0682ad9efe 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')
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list