[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2427-g00dfd78

[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  00dfd78db80fd6d2bac5c566dc1ec8dde4c5f409 (commit)
       via  3b4436aa90ba9f56085667d36c0a6c24c55c0cd7 (commit)
      from  3d07b0c1a377bcf9f806fd628094e68020679c37 (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=00dfd78db80fd6d2bac5c566dc1ec8dde4c5f409
commit 00dfd78db80fd6d2bac5c566dc1ec8dde4c5f409
Merge: 3d07b0c 3b4436a
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Mar 9 06:07:57 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 9 06:07:57 2013 -0500

    Merge topic 'ninja-var-line-break' into next
    
    3b4436a Ninja: escape line breaks in literals


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b4436aa90ba9f56085667d36c0a6c24c55c0cd7
commit 3b4436aa90ba9f56085667d36c0a6c24c55c0cd7
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sat Mar 9 12:04:16 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sat Mar 9 12:06:24 2013 +0100

    Ninja: escape line breaks in literals
    
    BUG: 13591

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index a999847..b02457d 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -83,6 +83,7 @@ std::string cmGlobalNinjaGenerator::EncodeLiteral(const std::string &lit)
 {
   std::string result = lit;
   cmSystemTools::ReplaceString(result, "$", "$$");
+  cmSystemTools::ReplaceString(result, "\n", "$\n");
   return result;
 }
 

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

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


hooks/post-receive
-- 
CMake