From 6e65d4225736cec2fb58168e0e66951483f13903 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 22 Feb 2021 23:05:46 +0200 Subject: libcamera: Enable vimc pipeline handler when tests are enabled The addition of the new IPA IPC mechanism compiles pipeline-specific headers to define the interface between the pipeline and the IPA. This was optimised in 08ce394465b5 ("meson: ipa, proxy: Only build proxies for enabled pipelines") to only build for enabled pipelines, however the tests directly use the VIMC pipeline handler, and require it to be built. Create a local variable to store the requested pipelines from the user configuration and extend the enabled pipelines to ensure that VIMC is always enabled if the tests are also enabled Fixes: 08ce394465b5 ("meson: ipa, proxy: Only build proxies for enabled pipelines") Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Tested-by: Sebastian Fricke --- src/ipa/meson.build | 2 +- src/libcamera/pipeline/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ipa/meson.build b/src/ipa/meson.build index 9d623f22..df385eae 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -22,7 +22,7 @@ ipa_sign = files('ipa-sign.sh') ipas = ['ipu3', 'raspberrypi', 'rkisp1', 'vimc'] ipa_names = [] -foreach pipeline : get_option('pipelines') +foreach pipeline : pipelines if ipas.contains(pipeline) subdir(pipeline) ipa_names += join_paths(ipa_install_dir, ipa_name + '.so') diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build index 46424493..30dc5b97 100644 --- a/src/libcamera/pipeline/meson.build +++ b/src/libcamera/pipeline/meson.build @@ -1,5 +1,5 @@ # SPDX-License-Identifier: CC0-1.0 -foreach pipeline : get_option('pipelines') +foreach pipeline : pipelines subdir(pipeline) endforeach -- cgit v1.2.1