diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-10-20 01:11:57 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-10-20 13:36:26 +0300 |
| commit | 24f8ef763a60f410963fd8897a16ae077aaeff0d (patch) | |
| tree | 2fee5d6093f3e51aff7260117f0fadf6f10e5dfa /src | |
| parent | cd5439fb97518d8bce0eb2af3f9562d6fd593acf (diff) | |
apps: Move libtiff dependency to src/apps/meson.build
libtiff is a shared dependency between cam and qcam, move it to
src/apps/. The shared dependency will be used to condition compilation
of source files in an upcoming application static library.
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/apps/cam/meson.build | 1 | ||||
| -rw-r--r-- | src/apps/meson.build | 2 | ||||
| -rw-r--r-- | src/apps/qcam/meson.build | 5 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/apps/cam/meson.build b/src/apps/cam/meson.build index 4b6099dd..297de64f 100644 --- a/src/apps/cam/meson.build +++ b/src/apps/cam/meson.build @@ -24,7 +24,6 @@ cam_cpp_args = [] libdrm = dependency('libdrm', required : false) libjpeg = dependency('libjpeg', required : false) libsdl2 = dependency('SDL2', required : false) -libtiff = dependency('libtiff-4', required : false) if libdrm.found() cam_cpp_args += [ '-DHAVE_KMS' ] diff --git a/src/apps/meson.build b/src/apps/meson.build index 62cff67e..b722a8f1 100644 --- a/src/apps/meson.build +++ b/src/apps/meson.build @@ -10,6 +10,8 @@ if not libevent.found() libevent = dependency('libevent_pthreads', required : opt_lc_compliance) endif +libtiff = dependency('libtiff-4', required : false) + subdir('lc-compliance') subdir('cam') diff --git a/src/apps/qcam/meson.build b/src/apps/qcam/meson.build index d5916d0d..e298101e 100644 --- a/src/apps/qcam/meson.build +++ b/src/apps/qcam/meson.build @@ -38,8 +38,7 @@ qcam_resources = files([ qt5_cpp_args = ['-DQT_NO_KEYWORDS'] -tiff_dep = dependency('libtiff-4', required : false) -if tiff_dep.found() +if libtiff.found() qt5_cpp_args += ['-DHAVE_TIFF'] qcam_sources += files([ '../cam/dng_writer.cpp', @@ -77,7 +76,7 @@ qcam = executable('qcam', qcam_sources, resources, dependencies : [ libatomic, libcamera_public, + libtiff, qt5_dep, - tiff_dep, ], cpp_args : qt5_cpp_args) |