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

cmMacroCommand: Execute loop only if it has an effect.

Browse Source
This commit is contained in:
Stephen Kelly 2015-01-25 15:44:49 +01:00
parent f95543f8a6
commit 11ecc31d0a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmMacroCommand.cxx
View File

@ -163,6 +163,8 @@ bool cmMacroHelperCommand::InvokeInitialPass
if (tmps.find("${ARGN}") != std::string::npos) if (tmps.find("${ARGN}") != std::string::npos)
{ {
if (!argnDefInitialized) if (!argnDefInitialized)
{
if (expandedArgs.size() > this->Args.size() - 1)
{ {
std::vector<std::string>::const_iterator eit std::vector<std::string>::const_iterator eit
= expandedArgs.begin(); = expandedArgs.begin();
@ -179,6 +181,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
} }
cnt ++; cnt ++;
} }
}
argnDefInitialized = true; argnDefInitialized = true;
} }
cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str()); cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());