development/webtester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qt detection

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-02-23 12:18:27 +00:00
parent bd448558c7
commit 548d3fdb0b
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -22,6 +22,10 @@ AC_CONFIG_FILES(makefile src/makefile debian/changelog debian/control)
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CC AC_PROG_CC
AC_CHECK_PROG(QMAKE, qmake-qt5)
AC_CHECK_PROG(QMAKE, qtchooser, [qtchooser -run-tool=qmake -qt=qt5])
AC_CHECK_PROG(QMAKE, qmake)
README=$(tail -n +3 README) README=$(tail -n +3 README)
README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g') README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g')
DESCRIPTION=$(head -1 README) DESCRIPTION=$(head -1 README)

2
debian/control.in vendored
View File

@@ -2,7 +2,7 @@ Source: @PACKAGE_NAME@
Section: devel Section: devel
Priority: extra Priority: extra
Maintainer: @AUTHOR@ Maintainer: @AUTHOR@
Build-Depends: debhelper (>= 8.0.0), libtool, svn2cl, autotools-dev, lsb-release, mrw-c++-dev, libxml-cxx-dev, qt5-qmake Build-Depends: debhelper (>= 8.0.0), pkg-config, libtool, svn2cl, autotools-dev, doxygen, graphviz, lsb-release, mrw-c++-dev, libxml-cxx-dev, qt5-qmake, libqt5webkit5-dev, qtchooser | qt5-default
Standards-Version: 3.9.2 Standards-Version: 3.9.2
Homepage: https://dev.marc.waeckerlin.org/redmine/@PACKAGE_NAME@ Homepage: https://dev.marc.waeckerlin.org/redmine/@PACKAGE_NAME@

2
src/makefile.am
View File

@@ -15,7 +15,7 @@ webrunner: make.webrunner
webtester: make.webtester webtester: make.webtester
makefile.%: ${srcdir}/webtester.pro makefile.%: ${srcdir}/webtester.pro
qmake -makefile -o $@ -config debug -config ${@:makefile.%=%} $< ${QMAKE} -makefile -o $@ -config debug -config ${@:makefile.%=%} $<
make.%: makefile.% make.%: makefile.%
make -f ${<} make -f ${<}