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 /configure.ac | |
| parent | 890dbb560f9f032bcd5232d688cb08b8e64d785b (diff) | |
| download | gstreamer-plugins-bad-b0773c6ea790862f014b468530a93cf89ae6f3d7.tar.gz | |
opencv: make compatible with opencv 4
Closed #826
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1bb19f082..c43a1f096 100644 --- a/configure.ac +++ b/configure.ac @@ -1846,7 +1846,7 @@ 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 >= 3.0.0 opencv < 3.5.0 , [ + PKG_CHECK_MODULES([OPENCV], [opencv >= 3.0.0 opencv < 3.5.0] , [ AC_PROG_CXX AC_LANG([C++]) OLD_CPPFLAGS=$CPPFLAGS @@ -1872,8 +1872,41 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [ HAVE_OPENCV="yes" fi ], [ + PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0 opencv4 < 4.1.0] , [ + AC_PROG_CXX + AC_LANG([C++]) + OLD_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$OPENCV_CFLAGS + something_not_found=no + AC_CHECK_HEADERS([opencv2/bgsegm.hpp \ + opencv2/calib3d.hpp \ + opencv2/core.hpp \ + opencv2/imgcodecs/legacy/constants_c.h \ + opencv2/imgproc/imgproc_c.h \ + opencv2/core/types_c.h \ + opencv2/core/core_c.h \ + opencv2/imgproc.hpp \ + opencv2/objdetect.hpp \ + opencv2/opencv.hpp \ + opencv2/video.hpp \ + opencv2/bgsegm.hpp], [], [something_not_found=yes]) + + CPPFLAGS=$OLD_CPPFLAGS + AC_LANG([C]) + + if test $something_not_found = "yes"; then + AC_MSG_RESULT([not all opencv2 headers were found]) + HAVE_OPENCV="no" + else + HAVE_OPENCV="yes" + fi + ], [ HAVE_OPENCV="no" ]) + ]) + OPENCV_PREFIX="`$PKG_CONFIG --variable=prefix opencv`" + AC_DEFINE_UNQUOTED(OPENCV_PREFIX, "$OPENCV_PREFIX", [opencv install prefix]) + AC_SUBST(OPENCV_PREFIX) OPENCV_PREFIX="`$PKG_CONFIG --variable=prefix opencv`" AC_DEFINE_UNQUOTED(OPENCV_PREFIX, "$OPENCV_PREFIX", [opencv install prefix]) AC_SUBST(OPENCV_PREFIX) |