Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-13 15:29:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: Consolidate all IPA headers in libcamera_ipa_headers

Browse source 
The IPA headers are listed in two different meson variables, one for
generated headers, and one for the other headers. There's no real reason
for this split, consolidate all of them in the libcamera_ipa_headers
variable.

While at it, don't add the IPA headers to the libcamera_internal_sources
variable, but list libcamera_ipa_headers in the sources for the shared
library. This moves the libcamera_internal_sources variable towards
holding source files, not header files, to improve clarity of the build
system.

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 02:01:05 +03:00
parent 29316a6693
commit 186d75b10c
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/libcamera/ipa/meson.build
View file

@ -11,8 +11,6 @@ libcamera_ipa_headers = files([
install_headers(libcamera_ipa_headers, install_headers(libcamera_ipa_headers,
subdir : libcamera_ipa_include_dir) subdir : libcamera_ipa_include_dir)
libcamera_generated_ipa_headers = []
ipa_headers_install_dir = get_option('includedir') / libcamera_ipa_include_dir ipa_headers_install_dir = get_option('includedir') / libcamera_ipa_include_dir
# #
@ -31,7 +29,7 @@ ipa_mojom_core = custom_target(core_mojom_file.split('.')[0] + '_mojom_module',
]) ])
# core_ipa_interface.h # core_ipa_interface.h
libcamera_generated_ipa_headers += custom_target('core_ipa_interface_h', libcamera_ipa_headers += custom_target('core_ipa_interface_h',
input : ipa_mojom_core, input : ipa_mojom_core,
output : 'core_ipa_interface.h', output : 'core_ipa_interface.h',
depends : mojom_templates, depends : mojom_templates,
@ -47,7 +45,7 @@ libcamera_generated_ipa_headers += custom_target('core_ipa_interface_h',
]) ])
# core_ipa_serializer.h # core_ipa_serializer.h
libcamera_generated_ipa_headers += custom_target('core_ipa_serializer_h', libcamera_ipa_headers += custom_target('core_ipa_serializer_h',
input : ipa_mojom_core, input : ipa_mojom_core,
output : 'core_ipa_serializer.h', output : 'core_ipa_serializer.h',
depends : mojom_templates, depends : mojom_templates,
@ -152,7 +150,7 @@ foreach pipeline, file : pipeline_ipa_mojom_mapping
'mojom': mojom, 'mojom': mojom,
} }
libcamera_generated_ipa_headers += [header, serializer, proxy_header] libcamera_ipa_headers += [header, serializer, proxy_header]
endforeach endforeach
ipa_mojom_files = [] ipa_mojom_files = []

3
src/libcamera/meson.build
View file

@ -55,7 +55,6 @@ libcamera_internal_sources = files([
]) ])
libcamera_public_sources += libcamera_public_headers libcamera_public_sources += libcamera_public_headers
libcamera_internal_sources += libcamera_generated_ipa_headers
libcamera_internal_sources += libcamera_tracepoint_header libcamera_internal_sources += libcamera_tracepoint_header
includes = [ includes = [
@ -196,6 +195,7 @@ libcamera_deps += [
libcamera = shared_library('libcamera', libcamera = shared_library('libcamera',
[ [
libcamera_public_sources, libcamera_public_sources,
libcamera_ipa_headers,
libcamera_internal_sources, libcamera_internal_sources,
], ],
version : libcamera_version, version : libcamera_version,
@ -216,7 +216,6 @@ libcamera_public = declare_dependency(sources : [
# Internal dependency for components and plugins which can use private APIs # Internal dependency for components and plugins which can use private APIs
libcamera_private = declare_dependency(sources : [ libcamera_private = declare_dependency(sources : [
libcamera_ipa_headers, libcamera_ipa_headers,
libcamera_generated_ipa_headers,
], ],
dependencies : [ dependencies : [
libcamera_public, libcamera_public,