[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7354-g0222788

[Eran Ifrah]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  02227888b572de741df035dd58f83deca21c5ff9 (commit)
       via  9751f292bbfe3c4de63f62c45e81ef42bea9e30f (commit)
       via  078e9e2c397ba25630756bc5c1c28c7262a385fb (commit)
      from  34d71cfc1f1c6fa93d8e2051216603098507a1e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02227888b572de741df035dd58f83deca21c5ff9
commit 02227888b572de741df035dd58f83deca21c5ff9
Merge: 34d71cf 9751f29
Author:     Eran Ifrah <eran.ifrah at gmail.com>
AuthorDate: Thu Jan 30 13:26:14 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 30 13:26:14 2014 -0500

    Merge topic 'codelite-generator-multi-jobs-bug-fix' into next
    
    9751f292 Use make's -jN switch when generating Unix/MinGW makefiles
    078e9e2c CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9751f292bbfe3c4de63f62c45e81ef42bea9e30f
commit 9751f292bbfe3c4de63f62c45e81ef42bea9e30f
Author:     Eran Ifrah <eran.ifrah at gmail.com>
AuthorDate: Thu Jan 30 20:16:48 2014 +0200
Commit:     Eran Ifrah <eran.ifrah at gmail.com>
CommitDate: Thu Jan 30 20:16:48 2014 +0200

    Use make's -jN switch when generating Unix/MinGW makefiles

diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index b156691..ff84fb7 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -449,8 +449,12 @@ cmExtraCodeLiteGenerator::GetBuildCommand(const cmMakefile* mf) const
     buildCommand = make;
     }
   else if ( generator == "MinGW Makefiles" ||
-            generator == "Unix Makefiles"  ||
-            generator == "Ninja" )
+            generator == "Unix Makefiles" )
+    {
+    ss << make << " -j " << this->CpuCount;
+    buildCommand = ss.str();
+    }
+  else if ( generator == "Ninja" )
     {
     ss << make;
     buildCommand = ss.str();

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake           |    2 +-
 Source/cmExtraCodeLiteGenerator.cxx |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake