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

libcamera: Use get_option('includedir') instead of raw 'include'

Browse source 
In most cases, file paths in meson files start with get_option().
To maintain a consistent theme, use meson's get_option('includedir')
universal option over raw 'include'. This option is defaulted to
'include' string value, hence this commit does not introduce any
functional changes.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Umang Jain 2021-05-07 11:28:41 +05:30 • committed by Kieran Bingham
parent 17bf7df227
commit 697e038e54
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/libcamera/meson.build
View file

@ -48,7 +48,7 @@ foreach header : control_source_files
output : header + '.h', output : header + '.h',
command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'], command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],
install : true, install : true,
install_dir : 'include' / include_dir) install_dir : get_option('includedir') / include_dir)
endforeach endforeach
libcamera_public_headers += control_headers libcamera_public_headers += control_headers
@ -63,7 +63,7 @@ formats_h = custom_target('formats_h',
output : 'formats.h', output : 'formats.h',
command : [gen_formats, '-o', '@OUTPUT@', '@INPUT@'], command : [gen_formats, '-o', '@OUTPUT@', '@INPUT@'],
install : true, install : true,
install_dir : 'include' / include_dir) install_dir : get_option('includedir') / include_dir)
libcamera_public_headers += formats_h libcamera_public_headers += formats_h
# libcamera.h # libcamera.h
@ -72,7 +72,7 @@ libcamera_h = custom_target('gen-header',
output : 'libcamera.h', output : 'libcamera.h',
command : [gen_header, meson.current_source_dir(), '@OUTPUT@'], command : [gen_header, meson.current_source_dir(), '@OUTPUT@'],
install : true, install : true,
install_dir : 'include' / include_dir) install_dir : get_option('includedir') / include_dir)
libcamera_public_headers += libcamera_h libcamera_public_headers += libcamera_h
@ -86,4 +86,4 @@ libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2])
configure_file(input : 'version.h.in', configure_file(input : 'version.h.in',
output : 'version.h', output : 'version.h',
configuration : libcamera_version_config, configuration : libcamera_version_config,
install_dir : 'include' / include_dir) install_dir : get_option('includedir') / include_dir)