summaryrefslogtreecommitdiffstats
path: root/Source/cmMacroCommand.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-02-11 18:17:29 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-02-11 21:58:33 (GMT)
commitf2c49f59d8dbca936a40b62a9079fa71ca551365 (patch)
tree3395514b98896aef7219b5ae9dfff5305ec4890e /Source/cmMacroCommand.cxx
parent3250a7e535684bec684c0109b31675ba72dc3aa9 (diff)
downloadCMake-f2c49f59d8dbca936a40b62a9079fa71ca551365.zip
CMake-f2c49f59d8dbca936a40b62a9079fa71ca551365.tar.gz
CMake-f2c49f59d8dbca936a40b62a9079fa71ca551365.tar.bz2
cmMacroCommand: Remove condition around ARGN computation.
An empty string is appended if the condition is false, which is ok for this commit.
Diffstat (limited to 'Source/cmMacroCommand.cxx')
-rw-r--r--Source/cmMacroCommand.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index b27b994..9fc479e 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -162,10 +162,7 @@ bool cmMacroHelperCommand::InvokeInitialPass
if (tmps.find("${ARGN}") != std::string::npos)
{
std::string argnDef;
- if (expandedArgs.size() > this->Args.size() - 1)
- {
- argnDef += expandedArgn;
- }
+ argnDef += expandedArgn;
cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
}