mirror of
https://git.libcamera.org/libcamera/libcamera.git
synced 2025-07-16 08:55:06 +03:00
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>
This commit is contained in:
parent
cd5439fb97
commit
24f8ef763a
3 changed files with 4 additions and 4 deletions
|
@ -24,7 +24,6 @@ cam_cpp_args = []
|
||||||
libdrm = dependency('libdrm', required : false)
|
libdrm = dependency('libdrm', required : false)
|
||||||
libjpeg = dependency('libjpeg', required : false)
|
libjpeg = dependency('libjpeg', required : false)
|
||||||
libsdl2 = dependency('SDL2', required : false)
|
libsdl2 = dependency('SDL2', required : false)
|
||||||
libtiff = dependency('libtiff-4', required : false)
|
|
||||||
|
|
||||||
if libdrm.found()
|
if libdrm.found()
|
||||||
cam_cpp_args += [ '-DHAVE_KMS' ]
|
cam_cpp_args += [ '-DHAVE_KMS' ]
|
||||||
|
|
|
@ -10,6 +10,8 @@ if not libevent.found()
|
||||||
libevent = dependency('libevent_pthreads', required : opt_lc_compliance)
|
libevent = dependency('libevent_pthreads', required : opt_lc_compliance)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
libtiff = dependency('libtiff-4', required : false)
|
||||||
|
|
||||||
subdir('lc-compliance')
|
subdir('lc-compliance')
|
||||||
|
|
||||||
subdir('cam')
|
subdir('cam')
|
||||||
|
|
|
@ -38,8 +38,7 @@ qcam_resources = files([
|
||||||
|
|
||||||
qt5_cpp_args = ['-DQT_NO_KEYWORDS']
|
qt5_cpp_args = ['-DQT_NO_KEYWORDS']
|
||||||
|
|
||||||
tiff_dep = dependency('libtiff-4', required : false)
|
if libtiff.found()
|
||||||
if tiff_dep.found()
|
|
||||||
qt5_cpp_args += ['-DHAVE_TIFF']
|
qt5_cpp_args += ['-DHAVE_TIFF']
|
||||||
qcam_sources += files([
|
qcam_sources += files([
|
||||||
'../cam/dng_writer.cpp',
|
'../cam/dng_writer.cpp',
|
||||||
|
@ -77,7 +76,7 @@ qcam = executable('qcam', qcam_sources, resources,
|
||||||
dependencies : [
|
dependencies : [
|
||||||
libatomic,
|
libatomic,
|
||||||
libcamera_public,
|
libcamera_public,
|
||||||
|
libtiff,
|
||||||
qt5_dep,
|
qt5_dep,
|
||||||
tiff_dep,
|
|
||||||
],
|
],
|
||||||
cpp_args : qt5_cpp_args)
|
cpp_args : qt5_cpp_args)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue