summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-02-05 19:46:36 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-02-05 19:46:36 (GMT)
commit252c5211b57e48da87b94a49503f515ef5edbe6f (patch)
tree2694cfff38a21500e37797ae9415e5258c70ebe9
parente6b72e8b8719f5cd8b7bd8b296c05123c0fb1395 (diff)
parenta55d5ca48179d3be4d8406028c0992d45ada8882 (diff)
downloadCMake-252c5211b57e48da87b94a49503f515ef5edbe6f.zip
CMake-252c5211b57e48da87b94a49503f515ef5edbe6f.tar.gz
CMake-252c5211b57e48da87b94a49503f515ef5edbe6f.tar.bz2
Merge topic 'ninja-link-rsp-newlines'
a55d5ca Ninja: Avoid LNK1170 linker error
-rw-r--r--Source/cmNinjaNormalTargetGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
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 = "";
}