From bfc09fe72e04b4e2db1950e44b4d5bc4c22174aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Lallement?= <raphael.lallement@laas.fr> Date: Wed, 15 May 2013 14:40:16 +0200 Subject: [PATCH] [wip/hatptester] Handle QT4 in better way Uses QMake to find include and libraries --- hatptester/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hatptester/Makefile b/hatptester/Makefile index e06c6568..0aa2900e 100644 --- a/hatptester/Makefile +++ b/hatptester/Makefile @@ -16,7 +16,9 @@ LICENSE= 2-clause-bsd MAKE_JOBS_SAFE= yes +USE_QMAKE= no CMAKE_ARGS+= -DmsgconnectorROOT=${PREFIX.msgconnector} +CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE=${QMAKE} DEPEND_ABI.boost-libs=boost-libs>=1.34 DEPEND_ABI.boost-headers=boost-headers>=1.34 @@ -25,6 +27,7 @@ include ../../wip/msgconnector/depend.mk include ../../devel/boost-headers/depend.mk include ../../devel/boost-libs/depend.mk include ../../mk/sysdep/cmake.mk +include ../../mk/sysdep/qmake.mk include ../../mk/sysdep/qt4-libs.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk -- GitLab