diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-02-11 19:08:05 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-02-11 21:58:34 (GMT) |
| commit | 9a1f8f35f48d7dcfefc70de9ae530c31b16cd9e0 (patch) | |
| tree | 19ff079f0d8e7df64860a4ecd3e65b85feaf4839 /Source/cmMacroCommand.cxx | |
| parent | 4aa7bd2ac11aa2edb0288e5ba360984b7799130d (diff) | |
| download | CMake-9a1f8f35f48d7dcfefc70de9ae530c31b16cd9e0.zip CMake-9a1f8f35f48d7dcfefc70de9ae530c31b16cd9e0.tar.gz CMake-9a1f8f35f48d7dcfefc70de9ae530c31b16cd9e0.tar.bz2 | |
cmMacroCommand: Move ARGV replacement out of condition.
Diffstat (limited to 'Source/cmMacroCommand.cxx')
| -rw-r--r-- | Source/cmMacroCommand.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index 111ad96..44b1465 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -160,14 +160,13 @@ bool cmMacroHelperCommand::InvokeInitialPass cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str()); cmSystemTools::ReplaceString(tmps, "${ARGN}", expandedArgn.c_str()); + cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str()); // if the current argument of the current function has ${ARGV in it // then try replacing ARGV values if (tmps.find("${ARGV") != std::string::npos) { char argvName[60]; - cmSystemTools::ReplaceString(tmps, "${ARGV}", expandedArgv.c_str()); - // also replace the ARGV1 ARGV2 ... etc for (unsigned int t = 0; t < expandedArgs.size(); ++t) { |