diff options
| author | Nicola Murino <nicola.murino@gmail.com> | 2018-11-25 16:13:28 +0100 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas@ndufresne.ca> | 2018-11-26 13:29:03 +0000 |
| commit | b0773c6ea790862f014b468530a93cf89ae6f3d7 (patch) | |
| tree | 48ef7886f54fd848f6a7940928c1a7acd68779b9 /ext/opencv/meson.build | |
| parent | 890dbb560f9f032bcd5232d688cb08b8e64d785b (diff) | |
| download | gstreamer-plugins-bad-b0773c6ea790862f014b468530a93cf89ae6f3d7.tar.gz | |
opencv: make compatible with opencv 4
Closed #826
Diffstat (limited to 'ext/opencv/meson.build')
| -rw-r--r-- | ext/opencv/meson.build | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build index ff2fc98f2..a1a09b1ed 100644 --- a/ext/opencv/meson.build +++ b/ext/opencv/meson.build @@ -39,6 +39,20 @@ libopencv_headers = [ 'opencv2/video.hpp', ] +libopencv4_headers = [ + 'opencv4/opencv2/bgsegm.hpp', + 'opencv4/opencv2/calib3d.hpp', + 'opencv4/opencv2/core.hpp', + 'opencv4/opencv2/imgcodecs/legacy/constants_c.h', + 'opencv4/opencv2/imgproc/imgproc_c.h', + 'opencv4/opencv2/core/types_c.h', + 'opencv4/opencv2/core/core_c.h', + 'opencv4/opencv2/imgproc.hpp', + 'opencv4/opencv2/objdetect.hpp', + 'opencv4/opencv2/opencv.hpp', + 'opencv4/opencv2/video.hpp', +] + gstopencv_cargs = ['-DGST_HAAR_CASCADES_DIR="@0@"'] opencv_dep = dependency('opencv', version : ['>= 3.0.0', '< 3.5.0'], required : false) @@ -51,6 +65,17 @@ if opencv_found opencv_found = false endif endforeach +else + opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.1.0'], required : false) + opencv_found = opencv_dep.found() + if opencv_found + foreach h : libopencv4_headers + if not cxx.has_header(h) + message('Needed header "' + h + '" not found') + opencv_found = false + endif + endforeach + endif endif if opencv_found @@ -67,7 +92,12 @@ if opencv_found if r.returncode() == 0 gstopencv_cargs += '-DOPENCV_PATH_NAME="OpenCV"' else - error('Unable to detect OpenCV data directory') + r = run_command('test', '-d', opencv_prefix + '/share/opencv4') + if r.returncode() == 0 + gstopencv_cargs += '-DOPENCV_PATH_NAME="opencv4"' + else + error('Unable to detect OpenCV data directory') + endif endif endif gstopencv = library('gstopencv', |