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

cmMacroCommand: Move computation of ARGV%n names out of double loop.

This commit is contained in:
Stephen Kelly 2015-02-11 20:16:40 +01:00
parent 9a1f8f35f4
commit 83414d5a07
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmMacroCommand.cxx
View File

@ -117,6 +117,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
{ {
variables.push_back("${" + this->Args[j] + "}"); variables.push_back("${" + this->Args[j] + "}");
} }
std::vector<std::string> argVs;
argVs.reserve(expandedArgs.size());
char argvName[60];
for (unsigned int j = 0; j < expandedArgs.size(); ++j)
{
sprintf(argvName,"${ARGV%i}",j);
argVs.push_back(argvName);
}
if(!this->Functions.empty()) if(!this->Functions.empty())
{ {
this->FilePath = this->Functions[0].FilePath; this->FilePath = this->Functions[0].FilePath;
@ -166,12 +174,9 @@ bool cmMacroHelperCommand::InvokeInitialPass
// then try replacing ARGV values // then try replacing ARGV values
if (tmps.find("${ARGV") != std::string::npos) if (tmps.find("${ARGV") != std::string::npos)
{ {
char argvName[60];
// also replace the ARGV1 ARGV2 ... etc
for (unsigned int t = 0; t < expandedArgs.size(); ++t) for (unsigned int t = 0; t < expandedArgs.size(); ++t)
{ {
sprintf(argvName,"${ARGV%i}",t); cmSystemTools::ReplaceString(tmps, argVs[t].c_str(),
cmSystemTools::ReplaceString(tmps, argvName,
expandedArgs[t].c_str()); expandedArgs[t].c_str());
} }
} }