Sun Aug 24 15:21:22 2014 UTC ()
Add QTDIR to CMAKE_PREFIX_PATH, so CMAKE finds qt5 when this bl3.mk is
included.


(wiz)
diff -r1.5 -r1.6 pkgsrc/x11/qt5-qtbase/buildlink3.mk
cvs diff -r1.5 -r1.6 pkgsrc/x11/qt5-qtbase/buildlink3.mk (switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/buildlink3.mk 2014/04/23 07:05:31 1.5
+++ pkgsrc/x11/qt5-qtbase/buildlink3.mk 2014/08/24 15:21:22 1.6
@@ -1,46 +1,47 @@ @@ -1,46 +1,47 @@
1# $NetBSD: buildlink3.mk,v 1.5 2014/04/23 07:05:31 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2014/08/24 15:21:22 wiz Exp $
2 2
3BUILDLINK_TREE+= qt5-qtbase 3BUILDLINK_TREE+= qt5-qtbase
4 4
5.if !defined(QT5_QTBASE_BUILDLINK3_MK) 5.if !defined(QT5_QTBASE_BUILDLINK3_MK)
6QT5_QTBASE_BUILDLINK3_MK:= 6QT5_QTBASE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.2.0 8BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.2.0
9BUILDLINK_ABI_DEPENDS.qt5-qtbase?= qt5-qtbase>=5.2.0nb6 9BUILDLINK_ABI_DEPENDS.qt5-qtbase?= qt5-qtbase>=5.2.0nb6
10BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase 10BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase
11 11
12BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include 12BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include
13BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib 13BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib
14BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins 14BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins
15 15
16QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 16QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5
 17CMAKE_PREFIX_PATH+= ${QTDIR}
17 18
18PTHREAD_OPTS+= require 19PTHREAD_OPTS+= require
19 20
20.include "../../devel/glib2/buildlink3.mk" 21.include "../../devel/glib2/buildlink3.mk"
21.include "../../devel/pcre/buildlink3.mk" 22.include "../../devel/pcre/buildlink3.mk"
22.include "../../devel/zlib/buildlink3.mk" 23.include "../../devel/zlib/buildlink3.mk"
23.include "../../fonts/fontconfig/buildlink3.mk" 24.include "../../fonts/fontconfig/buildlink3.mk"
24.include "../../graphics/freetype2/buildlink3.mk" 25.include "../../graphics/freetype2/buildlink3.mk"
25.include "../../graphics/png/buildlink3.mk" 26.include "../../graphics/png/buildlink3.mk"
26.include "../../security/openssl/buildlink3.mk" 27.include "../../security/openssl/buildlink3.mk"
27.include "../../textproc/icu/buildlink3.mk" 28.include "../../textproc/icu/buildlink3.mk"
28.if ${OPSYS} != "Darwin" 29.if ${OPSYS} != "Darwin"
29.include "../../graphics/glu/buildlink3.mk" 30.include "../../graphics/glu/buildlink3.mk"
30.include "../../x11/libxcb/buildlink3.mk" 31.include "../../x11/libxcb/buildlink3.mk"
31.include "../../x11/xcb-util/buildlink3.mk" 32.include "../../x11/xcb-util/buildlink3.mk"
32.include "../../x11/xcb-util-image/buildlink3.mk" 33.include "../../x11/xcb-util-image/buildlink3.mk"
33.include "../../x11/xcb-util-keysyms/buildlink3.mk" 34.include "../../x11/xcb-util-keysyms/buildlink3.mk"
34.include "../../x11/xcb-util-wm/buildlink3.mk" 35.include "../../x11/xcb-util-wm/buildlink3.mk"
35.include "../../x11/libSM/buildlink3.mk" 36.include "../../x11/libSM/buildlink3.mk"
36.include "../../x11/libX11/buildlink3.mk" 37.include "../../x11/libX11/buildlink3.mk"
37.include "../../x11/libXcursor/buildlink3.mk" 38.include "../../x11/libXcursor/buildlink3.mk"
38.include "../../x11/libXft/buildlink3.mk" 39.include "../../x11/libXft/buildlink3.mk"
39.include "../../x11/libXmu/buildlink3.mk" 40.include "../../x11/libXmu/buildlink3.mk"
40.include "../../x11/libXrandr/buildlink3.mk" 41.include "../../x11/libXrandr/buildlink3.mk"
41.include "../../x11/libXrender/buildlink3.mk" 42.include "../../x11/libXrender/buildlink3.mk"
42.include "../../x11/libxkbcommon/buildlink3.mk" 43.include "../../x11/libxkbcommon/buildlink3.mk"
43.endif 44.endif
44.endif # QT5_QTBASE_BUILDLINK3_MK 45.endif # QT5_QTBASE_BUILDLINK3_MK
45 46
46BUILDLINK_TREE+= -qt5-qtbase 47BUILDLINK_TREE+= -qt5-qtbase