pkgsrc-WIP-changes archive

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

brlcad: Unbreak cmake build; it must be installed into subprefix



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Oct 21 02:48:40 2016 +0200
Changeset:	1fc288e3e0ffa3c2b7c6770dc76bee88bb751738

Modified Files:
	brlcad/Makefile

Log Message:
brlcad: Unbreak cmake build; it must be installed into subprefix

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1fc288e3e0ffa3c2b7c6770dc76bee88bb751738

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 brlcad/Makefile | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diffs:
diff --git a/brlcad/Makefile b/brlcad/Makefile
index 388170e..eaf78b4 100644
--- a/brlcad/Makefile
+++ b/brlcad/Makefile
@@ -14,26 +14,17 @@ USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config wish flex
 USE_LANGUAGES=	c c++ fortran
 
-#CMAKE_ARGS+=	-DBRLCAD_BUNDLED_LIBS=ON
 CMAKE_ARGS+=	-DBRLCAD_BUNDLED_LIBS=OFF
 CMAKE_ARGS+=	-DLEMON_TEMPLATE:PATH=${PREFIX}/share/lemon/lempar.c
 
-CMAKE_ARGS+=	-DTINYCTHREAD_LIBRARY=${BUILDLINK_PREFIX.tinycthread}/lib/libtinycthread.so
-CMAKE_ARGS+=	-DTINYCTHREAD_INCLUDE_DIR=${BUILDLINK_PREFIX.tinycthread}/include
-
 CMAKE_ARGS+=	-DTERMLIB_LIBRARY=${BUILDLINK_PREFIX.terminfo}/lib/lib${BUILDLINK_LIBNAME.terminfo}.so
 CMAKE_ARGS+=	-DTERMLIB_INCLUDE_DIR=${BUILDLINK_PREFIX.terminfo}/include
 
 CMAKE_ARGS+=	-DNETPBM_LIBRARIES=${BUILDLINK_PREFIX.netpbm}/lib/libnetpbm.so
-CMAKE_ARGS+=	-DNETPBM_INCLUDE_DIRS=${BUILDLINK_PREFIX.netpbm}/include
-
-CMAKE_ARGS+=	-DTCL_INCLUDE_DIRS=${BUILDLINK_PREFIX.tcl}/include
-CMAKE_ARGS+=	-DTCL_TCLSH_EXECUTABLE=${TCLSH}
-CMAKE_ARGS+=	-DTCL_TCLSH=${TCLSH}
-CMAKE_ARGS+=	-DTCL_LIBRARIES=${BUILDLINK_PREFIX.tcl}/lib/libtcl.so # wrappers will fix it
-
-BROKEN=		CMake does not detect random things from system/pkgsrc, even it helped hard
+CMAKE_ARGS+=	-DNETPBM_INCLUDE_DIR=${BUILDLINK_PREFIX.netpbm}/include/netpbm
 
+# XXX: It needs a patch to be committed in ../../mk/configure/cmake.mk
+CMAKE_INSTALL_PREFIX=	${PREFIX}/brlcad
 
 MAKE_FLAGS+=	V=1
 MAKE_FLAGS+=	VERBOSE=1
@@ -67,6 +58,9 @@ BUILD_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
 BUILD_DEPENDS+=	swig-[0-9]*:../../devel/swig
 BUILD_DEPENDS+=	doxygen-[0-9]*:../../devel/doxygen
 
+.include "../../x11/tktable/buildlink3.mk"
+.include "../../wip/tcl-iwidgets/buildlink3.mk"
+.include "../../wip/tkhtml3/buildlink3.mk"
 .include "../../devel/tinycthread/buildlink3.mk"
 .include "../../graphics/adaptagrams/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"


Home | Main Index | Thread Index | Old Index