diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-01-25 15:44:49 +0100 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-02-11 20:51:06 +0100 |
| commit | 11ecc31d0a2da0090195a682364fb4628f55673a (patch) | |
| tree | be2a2068552632f25cb741a9814f5c57bf57f43c /Source/cmMacroCommand.cxx | |
| parent | f95543f8a6b38bf6d5350169bdb53d5066839b76 (diff) | |
| download | cmake-11ecc31d0a2da0090195a682364fb4628f55673a.tar.gz | |
cmMacroCommand: Execute loop only if it has an effect.
Diffstat (limited to 'Source/cmMacroCommand.cxx')
| -rw-r--r-- | Source/cmMacroCommand.cxx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index c1eb35e5fb..c1e7cbbc6f 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -164,20 +164,23 @@ bool cmMacroHelperCommand::InvokeInitialPass { if (!argnDefInitialized) { - std::vector<std::string>::const_iterator eit - = expandedArgs.begin(); - std::vector<std::string>::size_type cnt = 0; - for( ; eit != expandedArgs.end(); ++eit) + if (expandedArgs.size() > this->Args.size() - 1) { - 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; } |