[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1911-g41454ad

[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  41454ad8ea356b0611a93b91ea19dda6a6804523 (commit)
       via  a55d5ca48179d3be4d8406028c0992d45ada8882 (commit)
      from  c93e24cf6bc5b55488b85d127c67bfa03dc93b48 (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=41454ad8ea356b0611a93b91ea19dda6a6804523
commit 41454ad8ea356b0611a93b91ea19dda6a6804523
Merge: c93e24c a55d5ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 4 16:28:42 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 4 16:28:42 2013 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a55d5ca48179d3be4d8406028c0992d45ada8882
commit a55d5ca48179d3be4d8406028c0992d45ada8882
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Fri Feb 1 23:02:55 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 4 16:26:39 2013 -0500

    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..7e48cd7 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:


hooks/post-receive
-- 
CMake