From 0e6cd15b063399e83a5a964f9f311db5042c27fa Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 10 Nov 2020 16:05:34 +0000 Subject: src: meson: Simplify v4l2 enablement Simplify the src level meson file by moving the declaration of the v4l2 subdir to match the other invocations, making use of 'subdir_done()' to break out if the adaptation layer is not enabled. Signed-off-by: Kieran Bingham Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/meson.build | 5 +---- src/v4l2/meson.build | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index 8e219943..4b75f058 100644 --- a/src/meson.build +++ b/src/meson.build @@ -21,8 +21,5 @@ subdir('ipa') subdir('cam') subdir('qcam') -if get_option('v4l2') - subdir('v4l2') -endif - subdir('gstreamer') +subdir('v4l2') diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index e3838f0b..dbe6a424 100644 --- a/src/v4l2/meson.build +++ b/src/v4l2/meson.build @@ -1,5 +1,9 @@ # SPDX-License-Identifier: CC0-1.0 +if not get_option('v4l2') + subdir_done() +endif + v4l2_compat_sources = files([ 'v4l2_camera.cpp', 'v4l2_camera_file.cpp', -- cgit v1.2.1