summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-10-20 01:29:22 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-10-20 13:36:25 +0300
commitdaf3f4b59f4ea0ecb42c6a39fe909f071d3a2842 (patch)
tree8e4823d64abd8c83c3539ceac7658f99ae5d15fd
parent0fc7750ad6e0772af7306bf1b6c3578a8ffee61c (diff)
qcam: Simplify dependency handling for libtiff
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. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rw-r--r--src/qcam/meson.build14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/qcam/meson.build b/src/qcam/meson.build
index 9f5759ff..d5916d0d 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)