From 4aa7bd2ac11aa2edb0288e5ba360984b7799130d Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 11 Feb 2015 20:06:39 +0100 Subject: [PATCH] cmMacroCommand: Remove condition around ARGN replacement. There is none for ARGC replacement, so no reason to conditionalize the replacement. The computation is already done. --- Source/cmMacroCommand.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index 6635fee23..111ad96a0 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -159,11 +159,7 @@ bool cmMacroHelperCommand::InvokeInitialPass // replace argc cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str()); - // repleace ARGN - if (tmps.find("${ARGN}") != std::string::npos) - { - cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str()); - } + cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str()); // if the current argument of the current function has ${ARGV in it // then try replacing ARGV values