[Cmake-commits] CMake branch, next, updated. v2.8.8-3031-gb38e1a2

[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  b38e1a2a3335aa41a9ab91a1fc0608c2340bad71 (commit)
       via  c60557e973643c5d60da17911d096f7ac88996c2 (commit)
      from  95509a3a34593dca48ecc6b2cb5aa775480a116e (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=b38e1a2a3335aa41a9ab91a1fc0608c2340bad71
commit b38e1a2a3335aa41a9ab91a1fc0608c2340bad71
Merge: 95509a3 c60557e
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 5 19:37:10 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 5 19:37:10 2012 -0400

    Merge topic 'ninja-rspfile' into next
    
    c60557e Ninja: don't break because of empty commands


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c60557e973643c5d60da17911d096f7ac88996c2
commit c60557e973643c5d60da17911d096f7ac88996c2
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Wed Jun 6 01:36:34 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Wed Jun 6 01:36:34 2012 +0200

    Ninja: don't break because of empty commands

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index a91aa15..5477adf 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -225,10 +225,17 @@ cmGlobalNinjaGenerator::WriteCustomCommandBuild(const std::string& command,
                                                 const cmNinjaDeps& deps,
                                               const cmNinjaDeps& orderOnlyDeps)
 {
+  std::string cmd = command;
+#ifdef _WIN32
+   if (cmd.empty())
+      // TODO Shouldn't an empty command be handled by ninja?
+      cmd = "cmd.exe /c";
+#endif
+
   this->AddCustomCommandRule();
 
   cmNinjaVars vars;
-  vars["COMMAND"] = command;
+  vars["COMMAND"] = cmd;
   vars["DESC"] = EncodeLiteral(description);
 
   cmGlobalNinjaGenerator::WriteBuild(*this->BuildFileStream,

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

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


hooks/post-receive
-- 
CMake