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 --- include/libcamera/ipa/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/libcamera') diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build index a4d3f868..2d72c1fc 100644 --- a/include/libcamera/ipa/meson.build +++ b/include/libcamera/ipa/meson.build @@ -72,7 +72,7 @@ ipa_mojoms = [] foreach file : ipa_mojom_files name = file.split('.')[0] - if not get_option('pipelines').contains(name) + if name not in pipelines continue endif -- cgit v1.2.1