Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Aug 2018 12:43:41 +0000 (UTC)
From:      Vasil Dimov <vd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r477649 - head/net/cppzmq
Message-ID:  <201808201243.w7KChfLr046022@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vd
Date: Mon Aug 20 12:43:41 2018
New Revision: 477649
URL: https://svnweb.freebsd.org/changeset/ports/477649

Log:
  net/cppzmq: Fix CMake config installation path
  
  PR:		230771
  Submitted by:	jhale@
  Reported by:	jhale@

Modified:
  head/net/cppzmq/Makefile

Modified: head/net/cppzmq/Makefile
==============================================================================
--- head/net/cppzmq/Makefile	Mon Aug 20 10:37:38 2018	(r477648)
+++ head/net/cppzmq/Makefile	Mon Aug 20 12:43:41 2018	(r477649)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cppzmq
 PORTVERSION=	4.3.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
@@ -16,7 +17,10 @@ LIB_DEPENDS=	libzmq.so:net/libzmq4
 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 \
+		-DCPPZMQ_BUILD_TESTS:BOOL=OFF \
+		-DCPPZMQ_CMAKECONFIG_INSTALL_DIR:PATH="lib/cmake/${PORTNAME}" \
+		-Wno-dev
 
 # cppzmq is included in libzmq2
 CONFLICTS_INSTALL=	libzmq2
@@ -27,15 +31,12 @@ GH_ACCOUNT=	zeromq
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808201243.w7KChfLr046022>