pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt4-tools Tell locatin of uic and qmake with cmake...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/249092b0c270
branches:  trunk
changeset: 632558:249092b0c270
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Mar 31 11:29:04 2014 +0000

description:
Tell locatin of uic and qmake with cmake way too, and avoid to detect
unwanted builtin one.

diffstat:

 x11/qt4-tools/buildlink3.mk |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 799988fb08ea -r 249092b0c270 x11/qt4-tools/buildlink3.mk
--- a/x11/qt4-tools/buildlink3.mk       Mon Mar 31 11:25:22 2014 +0000
+++ b/x11/qt4-tools/buildlink3.mk       Mon Mar 31 11:29:04 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2014/02/12 23:18:55 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2014/03/31 11:29:04 obache Exp $
 
 BUILDLINK_TREE+=       qt4-tools
 
@@ -16,6 +16,8 @@
 MAKE_ENV+=             UIC="${QTDIR}/bin/uic"
 CONFIGURE_ENV+=                QMAKE="${QTDIR}/bin/qmake"
 MAKE_ENV+=             QMAKE="${QTDIR}/bin/qmake"
+CMAKE_ARGS+=           -DQT_UIC_EXECUTABLE=${QTDIR}/bin/uic
+CMAKE_ARGS+=           -DQT_QMAKE_EXECUTABLE=${QTDIR}/bin/qmake
 
 # the way the spec files are currently instealled via pkgsrc, they
 # are all identical anyway, so just pick one and point to it.



Home | Main Index | Thread Index | Old Index