[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1414-gecbc48c

[Peter Kuemmel]

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  ecbc48c2394fbd62e48573f5771b3fd2de999054 (commit)
       via  76c44309717adf25ebe5892adc3b4181766868a9 (commit)
       via  0c1f291a27e3916a62c66d48b37b21e0e5d3ce6e (commit)
      from  c26a74cf300772f1e4eaeb0228531b23e3a5e228 (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=ecbc48c2394fbd62e48573f5771b3fd2de999054
commit ecbc48c2394fbd62e48573f5771b3fd2de999054
Merge: c26a74c 76c4430
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Jan 5 02:35:43 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 5 02:35:43 2013 -0500

    Merge topic 'ninja-codeblocks-gui' into next
    
    76c4430 Ninja: fix building from Codeblocks GUI
    0c1f291 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76c44309717adf25ebe5892adc3b4181766868a9
commit 76c44309717adf25ebe5892adc3b4181766868a9
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sat Jan 5 08:29:58 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sat Jan 5 08:29:58 2013 +0100

    Ninja: fix building from Codeblocks GUI
    
    Many thx to Chuck Frayman
    
    BUG: 13652

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 25b13e5..0cf9cbb 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -811,6 +811,11 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
     command += " VERBOSE=1 ";
     command += target;
     }
+  else if (strcmp(this->GlobalGenerator->GetName(), "Ninja")==0)
+    {
+    command += " -v ";
+    command += target;
+    }
   else
     {
     std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);

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

Summary of changes:
 Source/CMakeVersion.cmake             |    2 +-
 Source/cmExtraCodeBlocksGenerator.cxx |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake