| Message ID | 20201123164319.152742-4-kieran.bingham@ideasonboard.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series |
|
| Related | show |
Hi Kieran, On Mon, Nov 23, 2020 at 04:43:14PM +0000, Kieran Bingham wrote: > 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. Is this a new meson feature? We should probably do the same with 'test' Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Thanks j > > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > 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 27f70544f1f6..8c7449f9b8a0 100644 > --- a/src/meson.build > +++ b/src/meson.build > @@ -20,8 +20,5 @@ subdir('ipa') > subdir('cam') > subdir('qcam') > > -if get_option('v4l2') > - subdir('v4l2') > -endif > - > +subdir('v4l2') > subdir('gstreamer') > diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build > index e3838f0b07cc..dbe6a424b10e 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', > -- > 2.25.1 > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
Hi Jacopo, On 24/11/2020 20:58, Jacopo Mondi wrote: > Hi Kieran, > > On Mon, Nov 23, 2020 at 04:43:14PM +0000, Kieran Bingham wrote: >> 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. > > Is this a new meson feature? We already use it for cam, and android layers. I think it makes the top level subdirs cleaner. > We should probably do the same with 'test' Good point, patch added to my series to do this locally. -- Kieran > > Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> > > Thanks > j > >> >> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> >> --- >> 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 27f70544f1f6..8c7449f9b8a0 100644 >> --- a/src/meson.build >> +++ b/src/meson.build >> @@ -20,8 +20,5 @@ subdir('ipa') >> subdir('cam') >> subdir('qcam') >> >> -if get_option('v4l2') >> - subdir('v4l2') >> -endif >> - >> +subdir('v4l2') >> subdir('gstreamer') >> diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build >> index e3838f0b07cc..dbe6a424b10e 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', >> -- >> 2.25.1 >> >> _______________________________________________ >> libcamera-devel mailing list >> libcamera-devel@lists.libcamera.org >> https://lists.libcamera.org/listinfo/libcamera-devel
Hi Kieran, Thank you for the patch. On Mon, Nov 23, 2020 at 04:43:14PM +0000, Kieran Bingham wrote: > 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 <kieran.bingham@ideasonboard.com> > --- > 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 27f70544f1f6..8c7449f9b8a0 100644 > --- a/src/meson.build > +++ b/src/meson.build > @@ -20,8 +20,5 @@ subdir('ipa') > subdir('cam') > subdir('qcam') > > -if get_option('v4l2') > - subdir('v4l2') > -endif > - > +subdir('v4l2') > subdir('gstreamer') I'd move v4l2 after gstreamer. Apart from that, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build > index e3838f0b07cc..dbe6a424b10e 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',
diff --git a/src/meson.build b/src/meson.build index 27f70544f1f6..8c7449f9b8a0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -20,8 +20,5 @@ subdir('ipa') subdir('cam') subdir('qcam') -if get_option('v4l2') - subdir('v4l2') -endif - +subdir('v4l2') subdir('gstreamer') diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index e3838f0b07cc..dbe6a424b10e 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',
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 <kieran.bingham@ideasonboard.com> --- src/meson.build | 5 +---- src/v4l2/meson.build | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-)