mirror-github-bspeice/libcvautomation
1
0
Fork 0
mirror of https://github.com/bspeice/libcvautomation synced 2024-12-04 13:58:11 -05:00
Code Issues Releases Wiki Activity

Commit the pkg-config files

Browse Source 
Fix some initial issues with not expanding '`'

Make sure that pkg-config was getting expanded correctly
This commit is contained in:
Bradlee Speice 2012-07-19 14:49:55 -04:00
parent 3879771a82
commit 0980f82d22
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -6,3 +6,9 @@ endif
#And the BASH macros
dist_sysconf_DATA = libcvautomation_funcs
#And the pkg-config files
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libcvautomation.pc
DISTCLEANFILES = libcvautomation.pc

19
configure.ac
View File

@ -32,16 +32,23 @@ AC_PATH_X
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(DOXYGEN_CV_VERSION, "opencv2")
AC_SUBST(CV_VERSION, "opencv2")
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(DOXYGEN_CV_VERSION, "opencv1")
AC_SUBST(CV_VERSION, "opencv1")
fi
AC_SUBST(CV_CFLAGS, [`pkg-config --cflags opencv`])
AC_SUBST(CV_LIBS, [`pkg-config --libs opencv`])
PKG_CHECK_MODULES([X11], [x11 >= 1.0.3])
AC_SUBST(X11_CFLAGS, [`pkg-config --cflags x11`])
AC_SUBST(X11_LIBS, [`pkg-config --libs x11`])
PKG_CHECK_MODULES([XTest], [xtst >= 0.21])
AC_SUBST(XTEST_CFLAGS, [`pkg-config --cflags xtst`])
AC_SUBST(XTEST_LIBS, [`pkg-config --libs xtst`])
AC_ARG_WITH(examples, [ --with-examples build example programs @<:@default=yes@:>@])
@ -97,4 +104,10 @@ fi
# Checks for library functions.
AC_FUNC_MALLOC
AC_OUTPUT([Makefile] [libcvautomation/Makefile] [examples/Makefile] [docs/Makefile])
AC_OUTPUT(
[Makefile]
[libcvautomation/Makefile]
[examples/Makefile]
[docs/Makefile]
[libcvautomation.pc]
)

2
docs/Doxyfile.in
View File

@ -459,7 +459,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
INPUT = @top_srcdir@/include/@DOXYGEN_CV_VERSION@ @top_srcdir@/examples
INPUT = @top_srcdir@/include/@CV_VERSION@ @top_srcdir@/examples
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp

10
libcvautomation.pc.in Normal file
View File

@ -0,0 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: Libcvautomation
Description: GUI Automation and Testing tool based on OpenCV and XTest
Version: @VERSION@
Libs: -L${libdir} -lcvautomation @CV_LIBS@ @X11_LIBS@ @XTEST_LIBS@
Cflags: -I${includedir} @CV_CFLAGS@ @X11_CFLAGS@ @XTEST_CFLAGS@