From 912214e34f2007af90daeb721c13653538480d58 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Thu, 24 Oct 2019 15:40:25 +0200 Subject: [PATCH] opencv: Don't error when unable to detect OpenCV data dir Instead, mark OpenCV as not found. We error out later if OpenCV was explicitly enabled. --- ext/opencv/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build index 7160a07..d84d12f 100644 --- a/ext/opencv/meson.build +++ b/ext/opencv/meson.build @@ -95,10 +95,14 @@ if opencv_found if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' else - error('Unable to detect OpenCV data directory') + message('Unable to detect OpenCV data directory') + opencv_found = false endif endif endif +endif + +if opencv_found gstopencv = library('gstopencv', gstopencv_sources, cpp_args : gst_plugins_bad_args + gstopencv_cargs + [ '-DGST_USE_UNSTABLE_API' ], -- 2.7.4