mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-30 07:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: fix build with opencv=enabled and opencv4. Fixes #964

Browse source 
Having the opencv feature enabled would lead to the opencv3 dependency
being required which failed with only opencv4 being available.

Instead don't require anything and error out at the end if the feature was enabled
but no dependency was found.
This commit is contained in:
Christoph Reiter 2019-05-05 22:11:16 +02:00 committed by Sebastian Dröge
parent 3c8a916501
commit 22c6a4085f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/opencv/meson.build
View file

@ -9,9 +9,9 @@ opencv_headers = [
'gstopencvvideofilter.h', 'gstopencvvideofilter.h',
] ]
opencv_dep = dependency('opencv', version : '>= 3.0.0', required : get_option('opencv')) opencv_dep = dependency('opencv', version : '>= 3.0.0', required : false)
if not opencv_dep.found() if not opencv_dep.found()
opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : get_option('opencv')) opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false)
endif endif
if opencv_dep.found() if opencv_dep.found()
gstopencv = library('gstopencv-' + api_version, gstopencv = library('gstopencv-' + api_version,
@ -30,4 +30,6 @@ if opencv_dep.found()
dependencies : [gstvideo_dep, opencv_dep]) dependencies : [gstvideo_dep, opencv_dep])
install_headers(opencv_headers, subdir : 'gstreamer-1.0/gst/opencv') install_headers(opencv_headers, subdir : 'gstreamer-1.0/gst/opencv')
elif get_option('opencv').enabled()
error('OpenCV support enabled but required dependencies were not found.')
endif endif