Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Feb 2014 22:15:15 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r343402 - head/Mk/Uses
Message-ID:  <201402082215.s18MFFig015164@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Feb  8 22:15:14 2014
New Revision: 343402
URL: http://svnweb.freebsd.org/changeset/ports/343402
QAT: https://qat.redports.org/buildarchive/r343402/

Log:
  Add a global CMAKE_NINJA variable to set in make.conf to use ninja instead of make(1) for ports using cmake

Modified:
  head/Mk/Uses/cmake.mk

Modified: head/Mk/Uses/cmake.mk
==============================================================================
--- head/Mk/Uses/cmake.mk	Sat Feb  8 22:14:29 2014	(r343401)
+++ head/Mk/Uses/cmake.mk	Sat Feb  8 22:15:14 2014	(r343402)
@@ -18,6 +18,7 @@
 #			Default: not set, until BATCH or PACKAGE_BUILDING is defined
 # CMAKE_NOCOLOR		- Disable colour build output
 #			Default: not set, until BATCH or PACKAGE_BUILDING is defined
+# CMAKE_NINJA		- Use ninja instead of make(1)
 #
 # Variables for ports:
 # CMAKE_ENV		- Environment passed to cmake.
@@ -99,6 +100,10 @@ CMAKE_ARGS+=		-DCMAKE_VERBOSE_MAKEFILE:B
 CMAKE_ARGS+=		-DCMAKE_COLOR_MAKEFILE:BOOL=OFF
 .endif
 
+.if defined(CMAKE_NINJA)
+.include "${USESDIR}/ninja.mk"
+.endif
+
 _CMAKE_MSG=		"===>  Performing in-source build"
 CMAKE_SOURCE_PATH?=	${WRKSRC}
 



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