mirror-github-bspeice/libcvautomation
1
0
Fork 0
mirror of https://github.com/bspeice/libcvautomation synced 2026-05-30 19:50:58 -04:00
Code Issues Releases Wiki Activity

Merge include/opencv1 and include/opencv2

Browse Source 
Warning, this is a brutish hack, and unless fixed, should not be used.
This commit is contained in:
Bradlee Speice
2012-07-19 17:17:06 -04:00
parent 556e8b59ed
commit c4c700fcda
17 changed files with 23 additions and 2551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -30,14 +30,23 @@ AC_PATH_X
#Configure OpenCV - version 2+ breaks a lot of things
PKG_CHECK_MODULES([OpenCV], [opencv >= 2.0.0], [use_opencv2=true], [use_opencv1=true])
AM_CONDITIONAL(USEOPENCV2, [test "$use_opencv2" != ""])
#Let doxygen know where our headers are at
AC_SUBST(CV_VERSION, "opencv2")
AC_SUBST(CV_HEADERS_1, ["/* OpenCV2 includes - some filenames are different"])
AC_SUBST(CV_HEADERS_2, [" * from the OpenCV1 counterparts */"])
AC_SUBST(CV_HEADERS_3, ["include <opencv2/core/core_c.h>"])
AC_SUBST(CV_HEADERS_4, ["include <opencv2/highgui/highgui_c.h>"])
AC_SUBST(CV_HEADERS_5, ["include <opencv2/imgproc/imgproc_c.h>"])
if test "$use_opencv1" != ""; then
echo "could not find OpenCV version 2.0.0 or higher, checking for 1.0.0 or higher..."
PKG_CHECK_MODULES([OpenCV], [opencv >= 1.0.0])
#Update doxygen on where our headers are at
AC_SUBST(CV_VERSION, "opencv1")
AC_SUBST(CV_HEADERS_1, ["/* OpenCV includes */"])
AC_SUBST(CV_HEADERS_2, [" " ])
AC_SUBST(CV_HEADERS_3, ["include <opencv/cv.h>"])
AC_SUBST(CV_HEADERS_4, ["include <opencv/highgui.h>"])
AC_SUBST(CV_HEADERS_5, ["define NEVER_USED"])
fi
AC_SUBST(CV_CFLAGS, [`pkg-config --cflags opencv`])
AC_SUBST(CV_LIBS, [`pkg-config --libs opencv`])
@ -111,4 +120,5 @@ AC_OUTPUT(
[docs/Makefile]
[libcvautomation.pc]
[rpm/libcvautomation.spec]
[include/libcvautomation/libcvautomation.h]
)