Attachment 196381 Details for Bug 230771 – Fix cmake config location

[patch] Fix cmake config location

cppzmq.diff (text/plain), 1.34 KB, created by Jason E. Hale on 2018-08-20 11:39:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2018-08-20 11:39:45 UTC

Size: 1.34 KB

patch

obsolete

>Index: net/cppzmq/Makefile
>===================================================================
>--- net/cppzmq/Makefile	(revision 477648)
>+++ net/cppzmq/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	cppzmq
> PORTVERSION=	4.3.0
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net
> 
>@@ -16,7 +17,8 @@
> NO_ARCH=	yes
> 
> USES=		cmake pkgconfig
>-CMAKE_ARGS=	--no-warn-unused-cli -Wno-dev -DCPPZMQ_BUILD_TESTS:BOOL=OFF
>+CMAKE_ARGS=	--no-warn-unused-cli -Wno-dev -DCPPZMQ_BUILD_TESTS:BOOL=OFF \
>+		-DCPPZMQ_CMAKECONFIG_INSTALL_DIR:PATH="lib/cmake/${PORTNAME}"
> 
> # cppzmq is included in libzmq2
> CONFLICTS_INSTALL=	libzmq2
>@@ -27,16 +29,13 @@
> PLIST_FILES=	\
> 	include/zmq.hpp \
> 	include/zmq_addon.hpp \
>-	share/cmake/Modules/cppzmqConfig.cmake \
>-	share/cmake/Modules/cppzmqConfigVersion.cmake \
>-	share/cmake/Modules/cppzmqTargets.cmake \
>-	share/cmake/Modules/libzmq-pkg-config/FindZeroMQ.cmake
>+	lib/cmake/${PORTNAME}/cppzmqConfig.cmake \
>+	lib/cmake/${PORTNAME}/cppzmqConfigVersion.cmake \
>+	lib/cmake/${PORTNAME}/cppzmqTargets.cmake \
>+	lib/cmake/${PORTNAME}/libzmq-pkg-config/FindZeroMQ.cmake
> 
> post-patch:
> 	${SED} -i '.orig' \
>-		-e 's|share/cmake/$${PROJECT_NAME}|share/cmake/Modules|' \
>-		${WRKSRC}/CMakeLists.txt
>-	${SED} -i '.orig' \
> 		-e 's|ZeroMQ_LIBRARY AND ZeroMQ_STATIC_LIBRARY|ZeroMQ_LIBRARY|' \
> 		${WRKSRC}/libzmq-pkg-config/FindZeroMQ.cmake
>

Actions: View | Diff

Attachments on bug 230771: 196381