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

cmMacroCommand: Move ARGV replacement out of condition.

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

3
Source/cmMacroCommand.cxx
View File

@ -160,14 +160,13 @@ bool cmMacroHelperCommand::InvokeInitialPass
cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str()); cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());
cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str()); cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str());
cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.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
// 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]; char argvName[60];
cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.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)
{ {