From 697e038e5422574e38236744d80f33294c5eba8b Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Fri, 7 May 2021 11:28:41 +0530 Subject: libcamera: Use get_option('includedir') instead of raw 'include' 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 Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham Signed-off-by: Kieran Bingham --- include/libcamera/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 4a5b915e..086c958b 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -48,7 +48,7 @@ foreach header : control_source_files output : header + '.h', command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'], install : true, - install_dir : 'include' / include_dir) + install_dir : get_option('includedir') / 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 : 'include' / include_dir) + install_dir : get_option('includedir') / 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 : 'include' / include_dir) + install_dir : get_option('includedir') / 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 : 'include' / include_dir) + install_dir : get_option('includedir') / include_dir) -- cgit v1.2.1