Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Apr 2014 21:45:56 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r351051 - head/Mk/Uses
Message-ID:  <201404112145.s3BLjuTv063863@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Fri Apr 11 21:45:55 2014
New Revision: 351051
URL: http://svnweb.freebsd.org/changeset/ports/351051
QAT: https://qat.redports.org/buildarchive/r351051/

Log:
  Allow an alternative install prefix to be specified with
  CMAKE_INSTALL_PREFIX.  This is similar to GNU_CONFIGURE_PREFIX and is
  useful for ports that would conflict if installed directly in PREFIX.

Modified:
  head/Mk/Uses/cmake.mk

Modified: head/Mk/Uses/cmake.mk
==============================================================================
--- head/Mk/Uses/cmake.mk	Fri Apr 11 21:43:45 2014	(r351050)
+++ head/Mk/Uses/cmake.mk	Fri Apr 11 21:45:55 2014	(r351051)
@@ -83,11 +83,13 @@ CMAKE_ARGS+=		-DCMAKE_C_COMPILER:STRING=
 			-DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_MODULE_LINKER_FLAGS:STRING="${LDFLAGS}" \
 			-DCMAKE_SHARED_LINKER_FLAGS:STRING="${LDFLAGS}" \
-			-DCMAKE_INSTALL_PREFIX:PATH="${PREFIX}" \
+			-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
 			-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \
 			-DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \
 			-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES
 
+CMAKE_INSTALL_PREFIX?=	${PREFIX}
+
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 CMAKE_VERBOSE=		yes
 CMAKE_NOCOLOR=		yes



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