summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2020-10-30 11:58:14 +0000
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-09-09 13:53:29 +0100
commit30d9c3485f9fdf1157e8b0832580ec8e967ec9b0 (patch)
tree091e663caee03a7b61bc4b75039c8f436340d4d5
parent10426792b7dcc3489216419777f2dcda31c1f46e (diff)
DocumentationUseOnly: Force enable Vivid
To make sure we always build the Vivid pipeline in this branch, explicitly add it to the build targets, and remove it from the pipeline configuration choices. This is not any kind of best practice for pipeline handlers, but is here to ensure that this pipeline is always compiled on this branch who's sole purpose is to use and demonstrate the vivid pipeline handler.
-rw-r--r--meson_options.txt2
-rw-r--r--src/libcamera/pipeline/meson.build2
2 files changed, 3 insertions, 1 deletions
diff --git a/meson_options.txt b/meson_options.txt
index a36a61db..2c80ad8b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -37,7 +37,7 @@ option('lc-compliance',
option('pipelines',
type : 'array',
- choices : ['ipu3', 'raspberrypi', 'rkisp1', 'simple', 'uvcvideo', 'vimc', 'vivid'],
+ choices : ['ipu3', 'raspberrypi', 'rkisp1', 'simple', 'uvcvideo', 'vimc'],
description : 'Select which pipeline handlers to include')
option('qcam',
diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build
index 30dc5b97..733aa737 100644
--- a/src/libcamera/pipeline/meson.build
+++ b/src/libcamera/pipeline/meson.build
@@ -3,3 +3,5 @@
foreach pipeline : pipelines
subdir(pipeline)
endforeach
+
+subdir('vivid')