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

libcamera: Drop libcamera_generated_ipa_headers from sources

Browse source 
The libcamera_generated_ipa_headers variable, containing the list of
generated IPA headers, is listed in the sources of IPA modules, as well
as IPA tests. This was done to ensure that the modules and tests get
rebuilt when the generate IPA headers change. However, the dependency is
already handled through the libcamera_private dependency object,
specified for all those modules and tests. There's no need to list the
IPA generated headers as sources. Drop them.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2024-08-05 01:26:18 +03:00
parent 29455194d6
commit 058cb9f4cc
8 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,8 +12,7 @@ ipu3_ipa_sources = files([
ipu3_ipa_sources += ipu3_ipa_algorithms
mod = shared_module(ipa_name,
[ipu3_ipa_sources, libcamera_generated_ipa_headers],
mod = shared_module(ipa_name, ipu3_ipa_sources,
name_prefix : '',
include_directories : [ipa_includes],
dependencies : [libcamera_private, libipa_dep],

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

@ -13,8 +13,7 @@ rkisp1_ipa_sources = files([
rkisp1_ipa_sources += rkisp1_ipa_algorithms
mod = shared_module(ipa_name,
[rkisp1_ipa_sources, libcamera_generated_ipa_headers],
mod = shared_module(ipa_name, rkisp1_ipa_sources,
name_prefix : '',
include_directories : [ipa_includes],
dependencies : [libcamera_private, libipa_dep],

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

@ -23,8 +23,7 @@ vc4_ipa_sources = files([
vc4_ipa_includes += include_directories('..')
mod = shared_module(ipa_name,
[vc4_ipa_sources, libcamera_generated_ipa_headers],
mod = shared_module(ipa_name, vc4_ipa_sources,
name_prefix : '',
include_directories : vc4_ipa_includes,
dependencies : [vc4_ipa_deps, libipa_dep],

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

@ -7,8 +7,7 @@ soft_simple_sources = files([
'black_level.cpp',
])
mod = shared_module(ipa_name,
[soft_simple_sources, libcamera_generated_ipa_headers],
mod = shared_module(ipa_name, soft_simple_sources,
name_prefix : '',
include_directories : [ipa_includes],
dependencies : [libcamera_private, libipa_dep],

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

@ -2,8 +2,7 @@
ipa_name = 'ipa_vimc'
mod = shared_module(ipa_name,
['vimc.cpp', libcamera_generated_ipa_headers],
mod = shared_module(ipa_name, 'vimc.cpp',
name_prefix : '',
include_directories : [ipa_includes],
dependencies : [libcamera_private, libipa_dep],

3
src/libcamera/proxy/worker/meson.build
View file

@ -17,8 +17,7 @@ foreach mojom : ipa_mojoms
'./' + '@INPUT@'
])
proxy = executable(mojom['name'] + '_ipa_proxy',
[worker, libcamera_generated_ipa_headers],
proxy = executable(mojom['name'] + '_ipa_proxy', worker,
install : true,
install_dir : proxy_install_dir,
dependencies : libcamera_private)

2
test/ipa/meson.build
View file

@ -8,7 +8,7 @@ ipa_test = [
]
foreach test : ipa_test
exe = executable(test['name'], test['sources'], libcamera_generated_ipa_headers,
exe = executable(test['name'], test['sources'],
dependencies : [libcamera_private, libipa_dep],
link_with : [test_libraries],
include_directories : [test_includes_internal])

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

@ -5,7 +5,7 @@ rkisp1_ipa_test = [
]
foreach test : rkisp1_ipa_test
exe = executable(test['name'], test['sources'], libcamera_generated_ipa_headers,
exe = executable(test['name'], test['sources'],
dependencies : [libcamera_private, libipa_dep],
link_with : [test_libraries],
include_directories : [test_includes_internal,