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

meson: Rename variables storing headers lists

Browse source 
The list of public, IPA and internal header files are stored in three
meson variables, named libcamera_api, libcamera_ipa_api and
libcamera_headers respectively. The lack of uniformity is a bit
confusing. Fix it by renaming those variables to
libcamera_public_headers, libcamera_ipa_headers and
libcamera_internal_headers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jacopo Mondi <jacopo@jmondi.org>
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2020-05-15 18:55:19 +03:00
parent f934fd1cb9
commit aa7e7175c7
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Documentation/meson.build
View file

@ -22,9 +22,9 @@ if doxygen.found()
custom_target('doxygen', custom_target('doxygen',
input : [ input : [
doxyfile, doxyfile,
libcamera_api, libcamera_internal_headers,
libcamera_ipa_api, libcamera_ipa_headers,
libcamera_headers, libcamera_public_headers,
libcamera_sources, libcamera_sources,
libipa_headers, libipa_headers,
libipa_sources, libipa_sources,

2
include/libcamera/internal/meson.build
View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
libcamera_headers = files([ libcamera_internal_headers = files([
'byte_stream_buffer.h', 'byte_stream_buffer.h',
'camera_controls.h', 'camera_controls.h',
'camera_sensor.h', 'camera_sensor.h',

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

@ -1,10 +1,10 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
libcamera_ipa_api = files([ libcamera_ipa_headers = files([
'ipa_controls.h', 'ipa_controls.h',
'ipa_interface.h', 'ipa_interface.h',
'ipa_module_info.h', 'ipa_module_info.h',
]) ])
install_headers(libcamera_ipa_api, install_headers(libcamera_ipa_headers,
subdir: join_paths(libcamera_include_dir, 'ipa')) subdir: join_paths(libcamera_include_dir, 'ipa'))

8
include/libcamera/meson.build
View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
libcamera_api = files([ libcamera_public_headers = files([
'bound_method.h', 'bound_method.h',
'buffer.h', 'buffer.h',
'camera.h', 'camera.h',
@ -26,7 +26,7 @@ include_dir = join_paths(libcamera_include_dir, 'libcamera')
subdir('internal') subdir('internal')
subdir('ipa') subdir('ipa')
install_headers(libcamera_api, install_headers(libcamera_public_headers,
subdir : include_dir) subdir : include_dir)
gen_controls = files('../../src/libcamera/gen-controls.py') gen_controls = files('../../src/libcamera/gen-controls.py')
@ -49,7 +49,7 @@ foreach header : control_source_files
install_dir : join_paths('include', include_dir)) install_dir : join_paths('include', include_dir))
endforeach endforeach
libcamera_api += control_headers libcamera_public_headers += control_headers
gen_header = files('gen-header.sh') gen_header = files('gen-header.sh')
@ -60,7 +60,7 @@ libcamera_h = custom_target('gen-header',
install : true, install : true,
install_dir : join_paths('include', include_dir)) install_dir : join_paths('include', include_dir))
libcamera_api += libcamera_h libcamera_public_headers += libcamera_h
version = libcamera_version.split('.') version = libcamera_version.split('.')
libcamera_version_config = configuration_data() libcamera_version_config = configuration_data()

5
src/libcamera/meson.build
View file

@ -138,7 +138,10 @@ libcamera = shared_library('camera',
build_rpath : '/', build_rpath : '/',
dependencies : libcamera_deps) dependencies : libcamera_deps)
libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api], libcamera_dep = declare_dependency(sources : [
libcamera_ipa_headers,
libcamera_public_headers,
],
include_directories : libcamera_includes, include_directories : libcamera_includes,
link_with : libcamera) link_with : libcamera)