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

Fix up the brutish hack into something that looks much better

Browse Source
This commit is contained in:
Bradlee Speice
2012-07-19 17:32:59 -04:00
parent c4c700fcda
commit 86332f894b
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -32,21 +32,14 @@ AC_PATH_X
PKG_CHECK_MODULES([OpenCV], [opencv >= 2.0.0], [use_opencv2=true], [use_opencv1=true])
#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>"])
AC_SUBST_FILE([cv_headers])
cv_headers=$srcdir/include/opencv2_includes
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"])
cv_headers=$srcdir/include/opencv1_includes
fi
AC_SUBST(CV_CFLAGS, [`pkg-config --cflags opencv`])
AC_SUBST(CV_LIBS, [`pkg-config --libs opencv`])