From 2ae7b2ff7438a4deecff2a8b5de685cc14e5cd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Tue, 17 Dec 2024 15:15:16 +0000 Subject: meson: Don't override pipeline list when `auto` is selected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consider `pipelines=auto,virtual`. Previously that would select everything that `auto` would, but not actually enable the `virtual` pipeline handler because the `pipelines` list was reset. Bug: https://bugs.libcamera.org/show_bug.cgi?id=247 Signed-off-by: Barnabás Pőcze Reviewed-by: Laurent Pinchart Acked-by: Kieran Bingham --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 06b9af94..5270f626 100644 --- a/meson.build +++ b/meson.build @@ -204,7 +204,7 @@ liblttng = dependency('lttng-ust', required : get_option('tracing')) # Pipeline handlers # -pipelines = get_option('pipelines') +wanted_pipelines = get_option('pipelines') arch_arm = ['arm', 'aarch64'] arch_x86 = ['x86', 'x86_64'] @@ -220,16 +220,18 @@ pipelines_support = { 'virtual': ['test'], } -if pipelines.contains('all') +if wanted_pipelines.contains('all') pipelines = pipelines_support.keys() -elif pipelines.contains('auto') +elif wanted_pipelines.contains('auto') host_cpu = host_machine.cpu_family() pipelines = [] foreach pipeline, archs : pipelines_support - if host_cpu in archs or 'any' in archs + if pipeline in wanted_pipelines or host_cpu in archs or 'any' in archs pipelines += pipeline endif endforeach +else + pipelines = wanted_pipelines endif # Tests require the vimc pipeline handler, include it automatically when tests -- cgit v1.2.1