[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2771-g5cd8e1f

[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  5cd8e1fdb5ca0e83ec2970dccbece9c50e2db31f (commit)
       via  b604d9335b559556a50faab29e2c37ac720c8927 (commit)
      from  067d587f9c11407e2cdafa0982a2fcc3f8c13060 (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=5cd8e1fdb5ca0e83ec2970dccbece9c50e2db31f
commit 5cd8e1fdb5ca0e83ec2970dccbece9c50e2db31f
Merge: 067d587 b604d93
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 27 09:08:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 27 09:08:03 2013 -0400

    Merge topic 'ninja_phony_targets' into next
    
    b604d93 cmLocalNinjaGenerator: Fix line-too-long style violation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b604d9335b559556a50faab29e2c37ac720c8927
commit b604d9335b559556a50faab29e2c37ac720c8927
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 27 08:37:11 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 27 08:37:11 2013 -0400

    cmLocalNinjaGenerator: Fix line-too-long style violation

diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index f6455fb..bdc3d80 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -340,14 +340,15 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement(
   this->AppendCustomCommandLines(cc, cmdLines);
 
   if (cmdLines.empty()) {
-    this->GetGlobalNinjaGenerator()->WritePhonyBuild(this->GetBuildFileStream(),
-                                                   "Phony custom command for " +
-                                                    ninjaOutputs[0],
-                                                   ninjaOutputs,
-                                                   ninjaDeps,
-                                                   cmNinjaDeps(),
-                                                   orderOnlyDeps,
-                                                   cmNinjaVars());
+    this->GetGlobalNinjaGenerator()->WritePhonyBuild(
+      this->GetBuildFileStream(),
+      "Phony custom command for " +
+      ninjaOutputs[0],
+      ninjaOutputs,
+      ninjaDeps,
+      cmNinjaDeps(),
+      orderOnlyDeps,
+      cmNinjaVars());
   } else {
     this->GetGlobalNinjaGenerator()->WriteCustomCommandBuild(
       this->BuildCommandLine(cmdLines),

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

Summary of changes:
 Source/cmLocalNinjaGenerator.cxx |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake