[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7384-g95a7a7d

[Brad King]

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  95a7a7d2e407c3ef200a8bbd5472e805b584c6bd (commit)
       via  75c051139a73b65d3278c1613e984584155bbef3 (commit)
      from  1412a1fc49282af014834735c139d8986cc72e8c (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=95a7a7d2e407c3ef200a8bbd5472e805b584c6bd
commit 95a7a7d2e407c3ef200a8bbd5472e805b584c6bd
Merge: 1412a1f 75c0511
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 3 10:56:40 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 3 10:56:40 2014 -0500

    Merge topic 'codelite-generator-multi-jobs-bug-fix' into next
    
    75c05113 CodeLite: Use make -jN switch when generating Unix/MinGW makefiles


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75c051139a73b65d3278c1613e984584155bbef3
commit 75c051139a73b65d3278c1613e984584155bbef3
Author:     Eran Ifrah <eran.ifrah at gmail.com>
AuthorDate: Thu Jan 30 20:16:48 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 3 10:56:48 2014 -0500

    CodeLite: Use make -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:


hooks/post-receive
-- 
CMake