[libcamera-devel] [PATCH v1 2/6] qcam: Simplify dependency handling for libtiff

[Kieran Bingham]

Quoting Laurent Pinchart via libcamera-devel (2022-10-20 00:15:33)
> There's no need to conditionally add tiff_dep to the list of qcam
> dependency, as a not found dependency() is ignored when listed in the
> executable dependencies argument.

Hrm ... that sounds counter-intuitive ... but also makes sense.

"I depend on this ... unless you can't find it ... in which case I
dont'..."

I can't immediately find the meson documentation to back that up. If you
found a reference it would be nice to add it here, but not essential.

Have you tested builds both with and without libtiff-4 being available
on the system?

Or do you need it to be explicitly tested?



> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  src/qcam/meson.build | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/src/qcam/meson.build b/src/qcam/meson.build
> index 9f5759ff0786..d5916d0df532 100644
> --- a/src/qcam/meson.build
> +++ b/src/qcam/meson.build
> @@ -36,18 +36,11 @@ qcam_resources = files([
>      'assets/feathericons/feathericons.qrc',
>  ])
>  
> -qcam_deps = [
> -    libatomic,
> -    libcamera_public,
> -    qt5_dep,
> -]
> -
>  qt5_cpp_args = ['-DQT_NO_KEYWORDS']
>  
>  tiff_dep = dependency('libtiff-4', required : false)
>  if tiff_dep.found()
>      qt5_cpp_args += ['-DHAVE_TIFF']
> -    qcam_deps += [tiff_dep]
>      qcam_sources += files([
>          '../cam/dng_writer.cpp',
>      ])
> @@ -81,5 +74,10 @@ resources = qt5.preprocess(moc_headers: qcam_moc_headers,
>  
>  qcam  = executable('qcam', qcam_sources, resources,
>                     install : true,
> -                   dependencies : qcam_deps,
> +                   dependencies : [
> +                       libatomic,
> +                       libcamera_public,
> +                       qt5_dep,
> +                       tiff_dep,
> +                   ],
>                     cpp_args : qt5_cpp_args)
> -- 
> Regards,
> 
> Laurent Pinchart
>