[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2364-ge49df8e

[Rolf Eike Beer]

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  e49df8ed2ad9a553debb3859f66d63816805847f (commit)
       via  c8e565a06e229e1524df01d965c8b7e7a757ce05 (commit)
      from  0fb12a6022e696cd60292ee7483800165e15e0d8 (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=e49df8ed2ad9a553debb3859f66d63816805847f
commit e49df8ed2ad9a553debb3859f66d63816805847f
Merge: 0fb12a6 c8e565a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Apr 15 14:21:43 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 15 14:21:43 2014 -0400

    Merge topic 'codelite-simplify' into next
    
    c8e565a0 CodeLite generator: simplify code a bit


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8e565a06e229e1524df01d965c8b7e7a757ce05
commit c8e565a06e229e1524df01d965c8b7e7a757ce05
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Apr 15 20:13:42 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Apr 15 20:13:42 2014 +0200

    CodeLite generator: simplify code a bit

diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx
index 8acc5b414..946d9d2 100644
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@@ -443,26 +443,22 @@ cmExtraCodeLiteGenerator::GetConfigurationName(const cmMakefile* mf) const
 std::string
 cmExtraCodeLiteGenerator::GetBuildCommand(const cmMakefile* mf) const
 {
-  std::stringstream ss;
   std::string generator = mf->GetSafeDefinition("CMAKE_GENERATOR");
   std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
   std::string buildCommand = make; // Default
-  if ( generator == "NMake Makefiles" )
+  if ( generator == "NMake Makefiles" ||
+       generator == "Ninja" )
     {
     buildCommand = make;
     }
   else if ( generator == "MinGW Makefiles" ||
             generator == "Unix Makefiles" )
     {
+    std::stringstream ss;
     ss << make << " -j " << this->CpuCount;
     buildCommand = ss.str();
     }
-  else if ( generator == "Ninja" )
-    {
-    ss << make;
-    buildCommand = ss.str();
-    }
-    return buildCommand;
+  return buildCommand;
 }
 
 std::string

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

Summary of changes:
 Source/cmExtraCodeLiteGenerator.cxx |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake