From 94d1af771e5f59237c4f3357bcab2d78012f0fea Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 29 Apr 2021 16:53:25 +0100 Subject: meson: summarise paths The IPAs are loaded from a defined location set as IPA_MODULE_DIR. Furthermore, configuration files for both libcamera and IPAs are loaded from paths defined during the meson configuration. To make it easy to identify these locations for a given configuration, present them as a 'paths' section in the meson summary. This adds a summary section to meson in the form: Paths LIBCAMERA_DATA_DIR : "/usr/share/libcamera" LIBCAMERA_SYSCONF_DIR : "/etc/camera/libcamera" IPA_PROXY_DIR : "/usr/libexec/libcamera" IPA_CONFIG_DIR : "/etc/camera/libcamera/ipa:/usr/share/libcamera/ipa" IPA_MODULE_DIR : "/usr/lib/x86_64-linux-gnu/libcamera" Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain Signed-off-by: Kieran Bingham --- src/ipa/meson.build | 5 +++++ src/libcamera/proxy/worker/meson.build | 4 ++++ src/meson.build | 5 +++++ 3 files changed, 14 insertions(+) (limited to 'src') diff --git a/src/ipa/meson.build b/src/ipa/meson.build index 49245e5e..e15a8a06 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -15,6 +15,11 @@ config_h.set('IPA_CONFIG_DIR', config_h.set('IPA_MODULE_DIR', '"' + get_option('prefix') / ipa_install_dir + '"') +summary({ + 'IPA_CONFIG_DIR' : config_h.get('IPA_CONFIG_DIR'), + 'IPA_MODULE_DIR' : config_h.get('IPA_MODULE_DIR'), + }, section : 'Paths') + subdir('libipa') ipa_sign = files('ipa-sign.sh') diff --git a/src/libcamera/proxy/worker/meson.build b/src/libcamera/proxy/worker/meson.build index 40dada9d..28fe5f1f 100644 --- a/src/libcamera/proxy/worker/meson.build +++ b/src/libcamera/proxy/worker/meson.build @@ -26,3 +26,7 @@ endforeach config_h.set('IPA_PROXY_DIR', '"' + get_option('prefix') / proxy_install_dir + '"') + +summary({ + 'IPA_PROXY_DIR' : config_h.get('IPA_PROXY_DIR'), + }, section : 'Paths') diff --git a/src/meson.build b/src/meson.build index edb7ce14..57396605 100644 --- a/src/meson.build +++ b/src/meson.build @@ -8,6 +8,11 @@ libcamera_sysconfdir = get_option('sysconfdir') / 'libcamera' config_h.set('LIBCAMERA_DATA_DIR', '"' + get_option('prefix') / libcamera_datadir + '"') config_h.set('LIBCAMERA_SYSCONF_DIR', '"' + get_option('prefix') / libcamera_sysconfdir + '"') +summary({ + 'LIBCAMERA_DATA_DIR' : config_h.get('LIBCAMERA_DATA_DIR'), + 'LIBCAMERA_SYSCONF_DIR' : config_h.get('LIBCAMERA_SYSCONF_DIR'), + }, section : 'Paths') + # Module Signing openssl = find_program('openssl', required : true) if openssl.found() -- cgit v1.2.1