From c698473440abee7330c76d2370c3c01ecc48b8e3 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Tue, 26 Jul 2022 15:20:51 +0200 Subject: libcamera: Correctly report enabled ipa modules "ipa_modules" stores the value of the ipas meson build option. IPAs are enabled if and only if there is an enabled pipeline for an IPA listed in "ipa_modules" array. It is basically the intersection of pipelines and ipa_modules array. In order to correctly report which IPAs get enabled, let's create a new array storing this intersection. Cc: Quentin Schulz Reported-by: Daniel Semkowicz Signed-off-by: Quentin Schulz Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi Signed-off-by: Jacopo Mondi --- meson.build | 2 +- src/ipa/meson.build | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3f7a3f56..e8b81ad8 100644 --- a/meson.build +++ b/meson.build @@ -173,7 +173,7 @@ py_mod.find_installation('python3', modules: py_modules) ## Summarise Configurations summary({ 'Enabled pipelines': pipelines, - 'Enabled IPA modules': ipa_modules, + 'Enabled IPA modules': enabled_ipa_modules, 'Tracing support': tracing_enabled, 'Android support': android_enabled, 'GStreamer support': gst_enabled, diff --git a/src/ipa/meson.build b/src/ipa/meson.build index e15a8a06..849bb372 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -27,6 +27,7 @@ ipa_sign = files('ipa-sign.sh') ipa_names = [] ipa_modules = get_option('ipas') +enabled_ipa_modules = [] # The ipa-sign-install.sh script which uses the ipa_names variable will itself # prepend MESON_INSTALL_DESTDIR_PREFIX to each ipa module name, therefore we @@ -35,6 +36,7 @@ foreach pipeline : pipelines if ipa_modules.contains(pipeline) subdir(pipeline) ipa_names += ipa_install_dir / ipa_name + '.so' + enabled_ipa_modules += pipeline endif endforeach -- cgit v1.2.1