diff options
| author | Vanessa Chipirras Navalon <vanechipi@qtec.com> | 2016-01-28 17:40:51 +0100 |
|---|---|---|
| committer | Luis de Bethencourt <luisbg@osg.samsung.com> | 2016-03-30 22:10:58 +0100 |
| commit | b37c759e528ed28997965e370357524f5701502e (patch) | |
| tree | 95fc11a7794c70e1762f37bbc2b52da397f39823 /configure.ac | |
| parent | 5d9df5d5d09b3d50b18540099c2b56ea9e4cecf4 (diff) | |
opencv: Ported to OpenCV version 3.1 OpenCV
configure.ac was changed to work with new versions of OpenCV 3.X.
A new include is added gstopencvutils.cpp because it contains
the previous. This keeps compatibility with 2.4.
https://bugzilla.gnome.org/show_bug.cgi?id=760473
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 78bb9d0cd..8f1992efd 100644 --- a/configure.ac +++ b/configure.ac @@ -2655,21 +2655,17 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [ dnl a new version and the no-backward-compatibility define. (There doesn't dnl seem to be a switch to suppress the warnings the cvcompat.h header dnl causes.) - PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.0 opencv < 2.5.0 , [ + PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.0 opencv <= 3.1.0 , [ AC_PROG_CXX AC_LANG([C++]) OLD_CPPFLAGS=$CPPFLAGS CPPFLAGS=$OPENCV_CFLAGS something_not_found=no - AC_CHECK_HEADERS([opencv2/contrib/contrib.hpp \ - opencv2/core/core_c.h \ - opencv2/core/types_c.h \ + AC_CHECK_HEADERS([opencv2/core/core_c.h \ opencv2/core/version.hpp \ opencv2/highgui/highgui_c.h \ opencv2/imgproc/imgproc.hpp \ opencv2/imgproc/imgproc_c.h \ - opencv2/legacy/compat.hpp \ - opencv2/legacy/legacy.hpp \ opencv2/objdetect/objdetect.hpp \ opencv2/video/background_segm.hpp], [], [something_not_found=yes]) CPPFLAGS=$OLD_CPPFLAGS |