PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Replace obselete join_paths() with '/' operator

Browse Source 
Since meson v0.49.0, join_paths() is equivalent to '/' hence,
drop and replace it with '/' short-hand in meson files.

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:40 +05:30
committed by Kieran Bingham
parent 99feb66df0
commit 17bf7df227
9 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libcamera/ipa/meson.build
View File

@@ -7,7 +7,7 @@ libcamera_ipa_headers = files([
])
install_headers(libcamera_ipa_headers,
subdir: join_paths(libcamera_include_dir, 'ipa'))
subdir: libcamera_include_dir / 'ipa')
libcamera_generated_ipa_headers = []

10
include/libcamera/meson.build
View File

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