[Cmake-commits] CMake branch, next, updated. v2.8.10.1-954-g8d7b04b

[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  8d7b04bef2138b9ba0c4ed78729174738210bd03 (commit)
       via  12ab1354fcd9fb1ddc3611615ed3d6053afcd5f4 (commit)
      from  5b0d1ca1dacfc289458db67c23dda0eac5995f58 (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=8d7b04bef2138b9ba0c4ed78729174738210bd03
commit 8d7b04bef2138b9ba0c4ed78729174738210bd03
Merge: 5b0d1ca 12ab135
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 20 16:05:28 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 20 16:05:28 2012 -0500

    Merge topic 'ninja-encode-LINK_FLAGS' into next
    
    12ab135 Ninja: encode LINK_FLAGS to handle bash variables


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12ab1354fcd9fb1ddc3611615ed3d6053afcd5f4
commit 12ab1354fcd9fb1ddc3611615ed3d6053afcd5f4
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 20 21:59:40 2012 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Nov 20 22:00:09 2012 +0100

    Ninja: encode LINK_FLAGS to handle bash variables
    
    Bug 13560

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 853bc12..65967a5 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -439,6 +439,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                             this->GetGeneratorTarget());
 
   this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]);
+  vars["LINK_FLAGS"] = cmGlobalNinjaGenerator
+                        ::EncodeLiteral(vars["LINK_FLAGS"]);
+
   vars["LINK_PATH"] = frameworkPath + linkPath;
 
   // Compute architecture specific link flags.  Yes, these go into a different

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

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


hooks/post-receive
-- 
CMake