kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMacroCommand: Remove intermediate arg variables.

This commit is contained in:
Stephen Kelly 2015-02-11 19:26:33 +01:00
parent f2c49f59d8
commit 8e0827b646
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmMacroCommand.cxx
View File

@ -161,9 +161,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
// repleace ARGN // repleace ARGN
if (tmps.find("${ARGN}") != std::string::npos) if (tmps.find("${ARGN}") != std::string::npos)
{ {
std::string argnDef; cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
argnDef += expandedArgn;
cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
} }
// if the current argument of the current function has ${ARGV in it // if the current argument of the current function has ${ARGV in it
@ -171,10 +169,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
if (tmps.find("${ARGV") != std::string::npos) if (tmps.find("${ARGV") != std::string::npos)
{ {
char argvName[60]; char argvName[60];
cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str());
std::string argvDef;
argvDef += expandedArgv;
cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
// also replace the ARGV1 ARGV2 ... etc // also replace the ARGV1 ARGV2 ... etc
for (unsigned int t = 0; t < expandedArgs.size(); ++t) for (unsigned int t = 0; t < expandedArgs.size(); ++t)