meson: Create and use a dependency for libcamera and its headers
Instead of manually adding the libcamera library and include path to every target that requires it, declare a dependency that groups the headers as source, the library and the include path, and use it through the project. This simplifies handling of the dependency. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
parent
41adc3f8d3
commit
3fac104158
11 changed files with 20 additions and 9 deletions
|
@ -6,6 +6,5 @@ cam_sources = files([
|
||||||
])
|
])
|
||||||
|
|
||||||
cam = executable('cam', cam_sources,
|
cam = executable('cam', cam_sources,
|
||||||
link_with : libcamera,
|
dependencies : libcamera_dep,
|
||||||
install : true,
|
install : true)
|
||||||
include_directories : libcamera_includes)
|
|
||||||
|
|
|
@ -65,3 +65,7 @@ libcamera = shared_library('camera',
|
||||||
install : true,
|
install : true,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
dependencies : libudev)
|
dependencies : libudev)
|
||||||
|
|
||||||
|
libcamera_dep = declare_dependency(sources : libcamera_api,
|
||||||
|
include_directories : libcamera_includes,
|
||||||
|
link_with : libcamera)
|
||||||
|
|
|
@ -15,9 +15,7 @@ qt5_dep = dependency('qt5',
|
||||||
|
|
||||||
if qt5_dep.found()
|
if qt5_dep.found()
|
||||||
qcam = executable('qcam', qcam_sources,
|
qcam = executable('qcam', qcam_sources,
|
||||||
link_with : libcamera,
|
|
||||||
install : true,
|
install : true,
|
||||||
include_directories : libcamera_includes,
|
dependencies : [libcamera_dep, qt5_dep],
|
||||||
dependencies : qt5_dep,
|
|
||||||
cpp_args : '-DQT_NO_KEYWORDS')
|
cpp_args : '-DQT_NO_KEYWORDS')
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -9,6 +9,7 @@ camera_tests = [
|
||||||
|
|
||||||
foreach t : camera_tests
|
foreach t : camera_tests
|
||||||
exe = executable(t[0], [t[1], 'camera_test.cpp'],
|
exe = executable(t[0], [t[1], 'camera_test.cpp'],
|
||||||
|
dependencies : libcamera_dep,
|
||||||
link_with : test_libraries,
|
link_with : test_libraries,
|
||||||
include_directories : test_includes_internal)
|
include_directories : test_includes_internal)
|
||||||
test(t[0], exe, suite : 'camera', is_parallel : false)
|
test(t[0], exe, suite : 'camera', is_parallel : false)
|
||||||
|
|
|
@ -5,6 +5,7 @@ ipa_modules_sources = [
|
||||||
|
|
||||||
foreach m : ipa_modules_sources
|
foreach m : ipa_modules_sources
|
||||||
shared_library(m, name_prefix : '',
|
shared_library(m, name_prefix : '',
|
||||||
|
dependencies : libcamera_dep,
|
||||||
include_directories : test_includes_public)
|
include_directories : test_includes_public)
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
@ -14,6 +15,7 @@ ipa_test = [
|
||||||
|
|
||||||
foreach t : ipa_test
|
foreach t : ipa_test
|
||||||
exe = executable(t[0], t[1],
|
exe = executable(t[0], t[1],
|
||||||
|
dependencies : libcamera_dep,
|
||||||
link_with : test_libraries,
|
link_with : test_libraries,
|
||||||
include_directories : test_includes_internal)
|
include_directories : test_includes_internal)
|
||||||
|
|
||||||
|
|
|
@ -2,15 +2,15 @@ libtest_sources = files([
|
||||||
'test.cpp',
|
'test.cpp',
|
||||||
])
|
])
|
||||||
|
|
||||||
libtest = static_library('libtest', libtest_sources)
|
libtest = static_library('libtest', libtest_sources,
|
||||||
|
dependencies : libcamera_dep)
|
||||||
|
|
||||||
libtest_includes = include_directories('.')
|
libtest_includes = include_directories('.')
|
||||||
|
|
||||||
test_libraries = [libcamera, libtest]
|
test_libraries = [libtest]
|
||||||
|
|
||||||
test_includes_public = [
|
test_includes_public = [
|
||||||
libtest_includes,
|
libtest_includes,
|
||||||
libcamera_includes,
|
|
||||||
]
|
]
|
||||||
|
|
||||||
test_includes_internal = [
|
test_includes_internal = [
|
||||||
|
|
|
@ -9,10 +9,12 @@ media_device_tests = [
|
||||||
]
|
]
|
||||||
|
|
||||||
lib_mdev_test = static_library('lib_mdev_test', lib_mdev_test_sources,
|
lib_mdev_test = static_library('lib_mdev_test', lib_mdev_test_sources,
|
||||||
|
dependencies : libcamera_dep,
|
||||||
include_directories : test_includes_internal)
|
include_directories : test_includes_internal)
|
||||||
|
|
||||||
foreach t : media_device_tests
|
foreach t : media_device_tests
|
||||||
exe = executable(t[0], t[1],
|
exe = executable(t[0], t[1],
|
||||||
|
dependencies : libcamera_dep,
|
||||||
link_with : [test_libraries, lib_mdev_test],
|
link_with : [test_libraries, lib_mdev_test],
|
||||||
include_directories : test_includes_internal)
|
include_directories : test_includes_internal)
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ internal_tests = [
|
||||||
|
|
||||||
foreach t : public_tests
|
foreach t : public_tests
|
||||||
exe = executable(t[0], t[1],
|
exe = executable(t[0], t[1],
|
||||||
|
dependencies : libcamera_dep,
|
||||||
link_with : test_libraries,
|
link_with : test_libraries,
|
||||||
include_directories : test_includes_public)
|
include_directories : test_includes_public)
|
||||||
|
|
||||||
|
@ -29,6 +30,7 @@ endforeach
|
||||||
|
|
||||||
foreach t : internal_tests
|
foreach t : internal_tests
|
||||||
exe = executable(t[0], t[1],
|
exe = executable(t[0], t[1],
|
||||||
|
dependencies : libcamera_dep,
|
||||||
link_with : test_libraries,
|
link_with : test_libraries,
|
||||||
include_directories : test_includes_internal)
|
include_directories : test_includes_internal)
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ ipu3_test = [
|
||||||
|
|
||||||
foreach t : ipu3_test
|
foreach t : ipu3_test
|
||||||
exe = executable(t[0], t[1],
|
exe = executable(t[0], t[1],
|
||||||
|
dependencies : libcamera_dep,
|
||||||
link_with : test_libraries,
|
link_with : test_libraries,
|
||||||
include_directories : test_includes_internal)
|
include_directories : test_includes_internal)
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@ v4l2_device_tests = [
|
||||||
|
|
||||||
foreach t : v4l2_device_tests
|
foreach t : v4l2_device_tests
|
||||||
exe = executable(t[0], [t[1], 'v4l2_device_test.cpp'],
|
exe = executable(t[0], [t[1], 'v4l2_device_test.cpp'],
|
||||||
|
dependencies : libcamera_dep,
|
||||||
link_with : test_libraries,
|
link_with : test_libraries,
|
||||||
include_directories : test_includes_internal)
|
include_directories : test_includes_internal)
|
||||||
test(t[0], exe, suite : 'v4l2_device', is_parallel : false)
|
test(t[0], exe, suite : 'v4l2_device', is_parallel : false)
|
||||||
|
|
|
@ -5,6 +5,7 @@ v4l2_subdevice_tests = [
|
||||||
|
|
||||||
foreach t : v4l2_subdevice_tests
|
foreach t : v4l2_subdevice_tests
|
||||||
exe = executable(t[0], [t[1], 'v4l2_subdevice_test.cpp'],
|
exe = executable(t[0], [t[1], 'v4l2_subdevice_test.cpp'],
|
||||||
|
dependencies : libcamera_dep,
|
||||||
link_with : test_libraries,
|
link_with : test_libraries,
|
||||||
include_directories : test_includes_internal)
|
include_directories : test_includes_internal)
|
||||||
test(t[0], exe, suite : 'v4l2_subdevice', is_parallel : false)
|
test(t[0], exe, suite : 'v4l2_subdevice', is_parallel : false)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue