mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-25 15:49:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

ENH: change expand stuff to pass a struct for all the args

Browse Source
This commit is contained in:
Bill Hoffman
2006-02-20 13:42:18 -05:00
parent e20c007181
commit 39e636a4a4
5 changed files with 101 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefileExecutableTargetGenerator.cxx
+9 -11
View File
@@ -294,21 +294,19 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
cleanObjs += variableName;
cleanObjs += ")";
cmLocalGenerator::RuleVariables vars;
vars.Language = linkLanguage;
vars.Objects = buildObjs.c_str();
vars.Target = targetOutPathReal.c_str();
std::string linkString = linklibs.str();
vars.LinkLibraries = linkString.c_str();
vars.Flags = flags.c_str();
vars.LinkFlags = linkFlags.c_str();
// Expand placeholders in the commands.
for(std::vector<std::string>::iterator i = commands.begin();
i != commands.end(); ++i)
{
this->LocalGenerator->ExpandRuleVariables(*i,
linkLanguage,
buildObjs.c_str(),
targetOutPathReal.c_str(),
linklibs.str().c_str(),
0,
0,
flags.c_str(),
0,
0,
linkFlags.c_str());
this->LocalGenerator->ExpandRuleVariables(*i, vars);
}
// Write the build rule.