Merge topic 'ninja-link-rsp-newlines'

a55d5ca Ninja: Avoid LNK1170 linker error
This commit is contained in:
Brad King 2013-02-05 14:46:36 -05:00 committed by CMake Topic Stage
commit 252c5211b5
1 changed files with 1 additions and 1 deletions

View File

@ -190,7 +190,7 @@ cmNinjaNormalTargetGenerator
linkOptionVar += cmTarget::GetTargetTypeName(targetType); linkOptionVar += cmTarget::GetTargetTypeName(targetType);
const std::string linkOption = const std::string linkOption =
GetMakefile()->GetSafeDefinition(linkOptionVar.c_str()); 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.Objects = responseFlag.c_str();
vars.LinkLibraries = ""; vars.LinkLibraries = "";
} }