[zorg] r279591 - Make sure cmake builds can find Ninja

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Tue Aug 23 19:01:39 2016
New Revision: 279591

URL: http://llvm.org/viewvc/llvm-project?rev=279591&view=rev
Log:
Make sure cmake builds can find Ninja

Modified:
    zorg/trunk/zorg/jenkins/build.py

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=279591&r1=279590&r2=279591&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Tue Aug 23 19:01:39 2016
@@ -164,6 +164,7 @@ class Configuration(object):
 # Global storage for configuration object.
 conf = None
 
+
 def cmake_builder(target):
     check_repo_state(conf.workspace)
 
@@ -174,6 +175,7 @@ def cmake_builder(target):
         env.extend(["env", "DYLD_LIBRARY_PATH=" + dyld_path])
 
     cmake_cmd = env + ["/usr/local/bin/cmake", "-G", "Ninja",
+                       '-DCMAKE_MAKE_PROGRAM=' + NINJA,
                        "-DCMAKE_INSTALL_PREFIX=" + conf.installdir(),
                        conf.srcdir()]