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

21
Source/cmMacroCommand.cxx
View File

@ -164,20 +164,23 @@ bool cmMacroHelperCommand::InvokeInitialPass
{ {
if (!argnDefInitialized) if (!argnDefInitialized)
{ {
std::vector<std::string>::const_iterator eit if (expandedArgs.size() > this->Args.size() - 1)
= expandedArgs.begin();
std::vector<std::string>::size_type cnt = 0;
for( ; eit != expandedArgs.end(); ++eit)
{ {
if ( cnt >= this->Args.size()-1 ) std::vector<std::string>::const_iterator eit
= expandedArgs.begin();
std::vector<std::string>::size_type cnt = 0;
for( ; eit != expandedArgs.end(); ++eit)
{ {
if (!argnDef.empty()) if ( cnt >= this->Args.size()-1 )
{ {
argnDef += ";"; if (!argnDef.empty())
{
argnDef += ";";
}
argnDef += *eit;
} }
argnDef += *eit; cnt ++;
} }
cnt ++;
} }
argnDefInitialized = true; argnDefInitialized = true;
} }