From owner-svn-ports-head@FreeBSD.ORG  Sat Feb  8 22:15:15 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 57A012D9;
 Sat,  8 Feb 2014 22:15:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 431AC13CF;
 Sat,  8 Feb 2014 22:15:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s18MFFVx015165;
 Sat, 8 Feb 2014 22:15:15 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s18MFFig015164;
 Sat, 8 Feb 2014 22:15:15 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201402082215.s18MFFig015164@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 8 Feb 2014 22:15:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343402 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Feb 2014 22:15:15 -0000

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}