[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1895-gd809b05

[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  d809b05a219b468bf2a2bd9488d9fad6dcb19552 (commit)
       via  be2af893cf32fbd5093da9edc8354b7af5bd5c95 (commit)
      from  bdc7d99d9b027158490aa310b2d99a089a556c57 (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=d809b05a219b468bf2a2bd9488d9fad6dcb19552
commit d809b05a219b468bf2a2bd9488d9fad6dcb19552
Merge: bdc7d99 be2af89
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 4 09:52:30 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 4 09:52:30 2013 -0500

    Merge topic 'ninja-link-rsp-newlines' into next
    
    be2af89 Ninja: Avoid LNK1170 linker error


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be2af893cf32fbd5093da9edc8354b7af5bd5c95
commit be2af893cf32fbd5093da9edc8354b7af5bd5c95
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Fri Feb 1 23:02:55 2013 +0100
Commit:     Patrick Gansterer <paroga at paroga.com>
CommitDate: Fri Feb 1 23:02:55 2013 +0100

    Ninja: Avoid LNK1170 linker error
    
    link.exe has problems with very very long lines in rsp files too.
    Use $in_newline instead of $in variable for rspcontent which
    separates the arguments with a newline instead of a simple space
    and was specially made for this purpose.

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 65967a5..12ebe44 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -190,7 +190,7 @@ cmNinjaNormalTargetGenerator
         linkOptionVar += cmTarget::GetTargetTypeName(targetType);
         const std::string linkOption =
                 GetMakefile()->GetSafeDefinition(linkOptionVar.c_str());
-        rspcontent = "$in " + linkOption + " $LINK_PATH $LINK_LIBRARIES";
+        rspcontent = "$in_newline " + linkOption + " $LINK_PATH $LINK_LIBRARIES";
         vars.Objects = responseFlag.c_str();
         vars.LinkLibraries = "";
     }

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

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


hooks/post-receive
-- 
CMake