diff options
| author | Umang Jain <umang.jain@ideasonboard.com> | 2021-05-07 11:28:40 +0530 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-05-11 11:50:45 +0100 |
| commit | 17bf7df22762b0ecb64d0c72baed608a90363199 (patch) | |
| tree | 70144f7932e8b2e7b1ee7f83c1852c4ccf7faffd /include | |
| parent | 99feb66df02988831c9e8535649b99fad9a78069 (diff) | |
meson: Replace obselete join_paths() with '/' operator
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libcamera/ipa/meson.build | 2 | ||||
| -rw-r--r-- | include/libcamera/meson.build | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build index 2d72c1fc..40c4e737 100644 --- a/include/libcamera/ipa/meson.build +++ b/include/libcamera/ipa/meson.build @@ -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 = [] diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index c7b8ee8e..4a5b915e 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -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) |