NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

meson: Group libipa and libipa_includes in a dependency object

Browse source 
Many build targets link with libipa and need libipa_includes. Group them
in a libipa_dep dependency object to simplify the users.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2024-06-11 14:55:37 +03:00
parent fceaa7f3e2
commit f305cacc9c
8 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ipa/ipu3/meson.build
View file

@ -15,9 +15,8 @@ ipu3_ipa_sources += ipu3_ipa_algorithms
mod = shared_module(ipa_name, mod = shared_module(ipa_name,
[ipu3_ipa_sources, libcamera_generated_ipa_headers], [ipu3_ipa_sources, libcamera_generated_ipa_headers],
name_prefix : '', name_prefix : '',
include_directories : [ipa_includes, libipa_includes], include_directories : [ipa_includes],
dependencies : libcamera_private, dependencies : [libcamera_private, libipa_dep],
link_with : libipa,
install : true, install : true,
install_dir : ipa_install_dir) install_dir : ipa_install_dir)

4
src/ipa/libipa/meson.build
View file

@ -25,3 +25,7 @@ libipa_includes = include_directories('..')
libipa = static_library('ipa', [libipa_sources, libipa_headers], libipa = static_library('ipa', [libipa_sources, libipa_headers],
include_directories : ipa_includes, include_directories : ipa_includes,
dependencies : libcamera_private) dependencies : libcamera_private)
libipa_dep = declare_dependency(sources : libipa_headers,
include_directories : libipa_includes,
link_with : libipa)

5
src/ipa/rkisp1/meson.build
View file

@ -16,9 +16,8 @@ rkisp1_ipa_sources += rkisp1_ipa_algorithms
mod = shared_module(ipa_name, mod = shared_module(ipa_name,
[rkisp1_ipa_sources, libcamera_generated_ipa_headers], [rkisp1_ipa_sources, libcamera_generated_ipa_headers],
name_prefix : '', name_prefix : '',
include_directories : [ipa_includes, libipa_includes], include_directories : [ipa_includes],
dependencies : libcamera_private, dependencies : [libcamera_private, libipa_dep],
link_with : libipa,
install : true, install : true,
install_dir : ipa_install_dir) install_dir : ipa_install_dir)

4
src/ipa/rpi/vc4/meson.build
View file

@ -15,7 +15,6 @@ vc4_ipa_libs = [
vc4_ipa_includes = [ vc4_ipa_includes = [
ipa_includes, ipa_includes,
libipa_includes,
] ]
vc4_ipa_sources = files([ vc4_ipa_sources = files([
@ -28,8 +27,7 @@ mod = shared_module(ipa_name,
[vc4_ipa_sources, libcamera_generated_ipa_headers], [vc4_ipa_sources, libcamera_generated_ipa_headers],
name_prefix : '', name_prefix : '',
include_directories : vc4_ipa_includes, include_directories : vc4_ipa_includes,
dependencies : vc4_ipa_deps, dependencies : [vc4_ipa_deps, libipa_dep],
link_with : libipa,
link_whole : vc4_ipa_libs, link_whole : vc4_ipa_libs,
install : true, install : true,
install_dir : ipa_install_dir) install_dir : ipa_install_dir)

5
src/ipa/simple/meson.build
View file

@ -10,9 +10,8 @@ soft_simple_sources = files([
mod = shared_module(ipa_name, mod = shared_module(ipa_name,
[soft_simple_sources, libcamera_generated_ipa_headers], [soft_simple_sources, libcamera_generated_ipa_headers],
name_prefix : '', name_prefix : '',
include_directories : [ipa_includes, libipa_includes], include_directories : [ipa_includes],
dependencies : libcamera_private, dependencies : [libcamera_private, libipa_dep],
link_with : libipa,
install : true, install : true,
install_dir : ipa_install_dir) install_dir : ipa_install_dir)

5
src/ipa/vimc/meson.build
View file

@ -5,9 +5,8 @@ ipa_name = 'ipa_vimc'
mod = shared_module(ipa_name, mod = shared_module(ipa_name,
['vimc.cpp', libcamera_generated_ipa_headers], ['vimc.cpp', libcamera_generated_ipa_headers],
name_prefix : '', name_prefix : '',
include_directories : [ipa_includes, libipa_includes], include_directories : [ipa_includes],
dependencies : libcamera_private, dependencies : [libcamera_private, libipa_dep],
link_with : libipa,
install : true, install : true,
install_dir : ipa_install_dir) install_dir : ipa_install_dir)

6
test/ipa/meson.build
View file

@ -9,9 +9,9 @@ ipa_test = [
foreach test : ipa_test foreach test : ipa_test
exe = executable(test['name'], test['sources'], libcamera_generated_ipa_headers, exe = executable(test['name'], test['sources'], libcamera_generated_ipa_headers,
dependencies : libcamera_private, dependencies : [libcamera_private, libipa_dep],
link_with : [libipa, test_libraries], link_with : [test_libraries],
include_directories : [libipa_includes, test_includes_internal]) include_directories : [test_includes_internal])
test(test['name'], exe, suite : 'ipa') test(test['name'], exe, suite : 'ipa')
endforeach endforeach

6
test/ipa/rkisp1/meson.build
View file

@ -6,9 +6,9 @@ rkisp1_ipa_test = [
foreach test : rkisp1_ipa_test foreach test : rkisp1_ipa_test
exe = executable(test['name'], test['sources'], libcamera_generated_ipa_headers, exe = executable(test['name'], test['sources'], libcamera_generated_ipa_headers,
dependencies : libcamera_private, dependencies : [libcamera_private, libipa_dep],
link_with : [libipa, test_libraries], link_with : [test_libraries],
include_directories : [libipa_includes, test_includes_internal, include_directories : [test_includes_internal,
'../../../src/ipa/rkisp1/']) '../../../src/ipa/rkisp1/'])
test(test['name'], exe, suite : 'ipa') test(test['name'], exe, suite : 'ipa')