From 741382374cd83289b57f9814632e2d52179d7e59 Mon Sep 17 00:00:00 2001
From: Arnaud Degroote <arnaud.degroote@laas.fr>
Date: Mon, 9 Jan 2012 15:42:54 +0100
Subject: [PATCH] [wip/jafar-qdisplay] Help cmake to find the right qmake
While here, add the correct headings
---
jafar-qdisplay/Makefile | 9 +++++++++
jafar-qdisplay/depend.mk | 3 +++
2 files changed, 12 insertions(+)
diff --git a/jafar-qdisplay/Makefile b/jafar-qdisplay/Makefile
index 4d362cd9..93a25166 100644
--- a/jafar-qdisplay/Makefile
+++ b/jafar-qdisplay/Makefile
@@ -1,3 +1,7 @@
+# robotpkg Makefile for: wip/jafar-qdisplay
+# Created: Cyril Roussillon on Wed, 15 Jun 2011
+#
+
PKGVERSION= 0.1
DISTNAME= jafar-qdisplay-0.1
PKGNAME= jafar-qdisplay-0.1
@@ -14,8 +18,12 @@ USE_PKGLOCALEDIR= yes
CPPFLAGS += -DJFR_NDEBUG
CXXFLAGS += -pthread
+DEPEND_ABI.qmake= qmake>=2
+USE_QMAKE= no
+
CMAKE_ARGS+= -DBOOST_INCLUDEDIR=${PREFIX.boost-headers}/include
CMAKE_ARGS+= -DBOOST_LIBDIR=${PREFIX.boost-libs}/include
+CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE=${QMAKE}
include ../../wip/jafar-kernel/depend.mk
include ../../wip/jafar-image/depend.mk
@@ -27,5 +35,6 @@ include ../../math/boost-numeric-bindings/depend.mk
include ../../pkgtools/libtool/depend.mk
include ../../pkgtools/pkg-config/depend.mk
include ../../mk/sysdep/cmake.mk
+include ../../mk/sysdep/qmake.mk
include ../../mk/sysdep/qt4-libs.mk
include ../../mk/robotpkg.mk
diff --git a/jafar-qdisplay/depend.mk b/jafar-qdisplay/depend.mk
index 144c8129..72ad9a70 100644
--- a/jafar-qdisplay/depend.mk
+++ b/jafar-qdisplay/depend.mk
@@ -1,3 +1,6 @@
+# robotpkg depend.mk for: wip/jafar-qdisplay
+# Created: Cyril Roussillon on Wed, 15 Jun 2011
+#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
jafar-qdisplay_DEPEND_MK:= ${jafar-qdisplay_DEPEND_MK}+
--
GitLab