[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5731-g208e8a0

[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  208e8a07ee7a04d4cc6b27fb4d8815f22c9d2bb7 (commit)
       via  b6f1142c8b712fb5ebfd2515a400a0b5ac621a49 (commit)
      from  05bcaed2d6603958e1dfbab5fa1c52b1f66306c3 (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=208e8a07ee7a04d4cc6b27fb4d8815f22c9d2bb7
commit 208e8a07ee7a04d4cc6b27fb4d8815f22c9d2bb7
Merge: 05bcaed b6f1142
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 25 06:10:39 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 06:10:39 2013 -0500

    Merge topic 'ninja-quoted-cmd-commands' into next
    
    b6f1142 Ninja: multiple commands must be quoted


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6f1142c8b712fb5ebfd2515a400a0b5ac621a49
commit b6f1142c8b712fb5ebfd2515a400a0b5ac621a49
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 25 11:17:14 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Nov 25 12:08:10 2013 +0100

    Ninja: multiple commands must be quoted
    
    Bug 14370

diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx
index f1d5e2c..84d89df 100644
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@@ -287,16 +287,32 @@ std::string cmLocalNinjaGenerator::BuildCommandLine(
 
   cmOStringStream cmd;
   for (std::vector<std::string>::const_iterator li = cmdLines.begin();
-       li != cmdLines.end(); ++li) {
-    if (li != cmdLines.begin()) {
-      cmd << " && ";
+       li != cmdLines.end(); ++li)
 #ifdef _WIN32
-    } else if (cmdLines.size() > 1) {
-      cmd << "cmd.exe /c ";
-#endif
+    {
+    if (li != cmdLines.begin())
+      {
+      cmd << " && ";
+      }
+    else if (cmdLines.size() > 1)
+      {
+      cmd << "cmd.exe /C \"";
+      }
+    cmd << *li;
     }
+  if (cmdLines.size() > 1)
+    {
+    cmd << "\"";
+    }
+#else
+    {
+    if (li != cmdLines.begin())
+      {
+      cmd << " && ";
+      }
     cmd << *li;
-  }
+    }
+#endif
   return cmd.str();
 }
 

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

Summary of changes:
 Source/cmLocalNinjaGenerator.cxx |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake