Enable cmake builds to (optionally) use ninja

build_tools/common.sh

 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Environment variable NACL_ARCH should be set to one of the following
 # values: i686 x86_64 pnacl arm
 
 
 # NAMING CONVENTION
 # =================
@@ skipping 1069 matching lines @@
     --${NACL_OPTION}-mmx \
     --${NACL_OPTION}-sse \
     --${NACL_OPTION}-sse2 \
     --${NACL_OPTION}-asm \
     --with-x=no \
     ${EXTRA_CONFIGURE_ARGS:-}
 }
 
 
 ConfigureStep_CMake() {
-  if [ "${VERBOSE:-}" = "1" ]; then
-    MAKE_TARGETS+=" VERBOSE=1"
+  if [ "${CMAKE_USE_NINJA:-}" = "1" ]; then
+    EXTRA_CMAKE_ARGS+=" -GNinja"
   fi
 
   EXTRA_CMAKE_ARGS=${EXTRA_CMAKE_ARGS:-}
   if [ "${NACL_LIBC}" = "newlib" ]; then
     EXTRA_CMAKE_ARGS+=" -DEXTRA_INCLUDE=${NACLPORTS_INCLUDE}/glibc-compat"
   fi
 
   CC="${NACLCC}" CXX="${NACLCXX}" LogExecute cmake ${SRC_DIR} \
            -DCMAKE_TOOLCHAIN_FILE=${TOOLS_DIR}/XCompile-nacl.cmake \
            -DNACLAR=${NACLAR} \
            -DNACLLD=${NACLLD} \
            -DNACL_CROSS_PREFIX=${NACL_CROSS_PREFIX} \
            -DNACL_SDK_ROOT=${NACL_SDK_ROOT} \
            -DNACL_TOOLCHAIN_ROOT=${NACL_TOOLCHAIN_ROOT} \
            -DCMAKE_PREFIX_PATH=${NACL_PREFIX} \
            -DCMAKE_INSTALL_PREFIX=${PREFIX} \
-           -DCMAKE_BUILD_TYPE=RELEASE ${EXTRA_CMAKE_ARGS:-}
+           -DCMAKE_BUILD_TYPE=RELEASE ${EXTRA_CMAKE_ARGS}
 }
 
 
 DefaultBuildStep() {
+  if [ "${CMAKE_USE_NINJA:-}" = "1" ]; then
+    if [ "${VERBOSE:-}" = "1" ]; then
+      NINJA_ARGS="-v"
+    fi
+    LogExecute ninja ${NINJA_ARGS:-} ${MAKE_TARGETS:-}
+    return
+  fi
+
   # Build ${MAKE_TARGETS} or default target if it is not defined
   if [ -n "${MAKEFLAGS:-}" ]; then
     echo "MAKEFLAGS=${MAKEFLAGS}"
     export MAKEFLAGS
   fi
   if [ "${VERBOSE:-}" = "1" ]; then
     MAKE_TARGETS+=" VERBOSE=1 V=1"
   fi
   export PATH=${NACL_BIN_PATH}:${PATH}
   LogExecute make -j${OS_JOBS} ${MAKE_TARGETS:-}
@@ skipping 26 matching lines @@
   echo "No tests defined for ${PACKAGE_NAME}"
 }
 
 
 DefaultPostInstallTestStep() {
   echo "No post-packaging tests defined for ${PACKAGE_NAME}"
 }
 
 
 DefaultInstallStep() {
+  INSTALL_TARGETS=${INSTALL_TARGETS:-install}
+
+  if [ "${CMAKE_USE_NINJA:-}" = "1" ]; then
+    DESTDIR=${DESTDIR} LogExecute ninja ${INSTALL_TARGETS}
+    return
+  fi
+
   # assumes pwd has makefile
   if [ -n "${MAKEFLAGS:-}" ]; then
     echo "MAKEFLAGS=${MAKEFLAGS}"
     export MAKEFLAGS
   fi
   export PATH=${NACL_BIN_PATH}:${PATH}
-  LogExecute make ${INSTALL_TARGETS:-install} DESTDIR=${DESTDIR}
+  LogExecute make ${INSTALL_TARGETS} DESTDIR=${DESTDIR}
 }
 
 
 DefaultPythonModuleInstallStep() {
   Banner "Installing ${PACKAGE_NAME}"
   # We've installed already previously.  We just need to collect our modules.
   MakeDir ${NACL_HOST_PYROOT}/python_modules/
   if [ -e ${START_DIR}/modules.list ] ; then
     LogExecute cp ${START_DIR}/modules.list \
                   ${DEST_PYTHON_OBJS}/${PACKAGE_NAME}.list
@@ skipping 406 matching lines @@
 # These functions are called when this script is imported to do
 # any essential checking/setup operations.
 ######################################################################
 CheckToolchain
 CheckPatchVersion
 CheckSDKVersion
 PatchSpecFile
 InjectSystemHeaders
 InstallConfigSite
 GetRevision