diff options
author | Brad King <brad.king@kitware.com> | 2002-12-11 18:13:33 -0500 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2002-12-11 18:13:33 -0500 |
commit | 4888c088ae0ca829862e8b2f9568abca12dc34d1 (patch) | |
tree | 2c0fb825f1d1adff97d98373b555f00b84da14f7 /Source/cmRemoveCommand.cxx | |
parent | 5a321605bcc15c7e559c8da5168eef00796148b1 (diff) | |
download | cmake-4888c088ae0ca829862e8b2f9568abca12dc34d1.tar.gz |
ENH: Moved ExpandListVariables out of individual commands. Argument evaluation rules are now very consistent. Double quotes can always be used to create exactly one argument, regardless of contents inside.
Diffstat (limited to 'Source/cmRemoveCommand.cxx')
-rw-r--r-- | Source/cmRemoveCommand.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmRemoveCommand.cxx b/Source/cmRemoveCommand.cxx index 136b973005..44c33d4b2a 100644 --- a/Source/cmRemoveCommand.cxx +++ b/Source/cmRemoveCommand.cxx @@ -37,19 +37,17 @@ bool cmRemoveCommand::InitialPass(std::vector<std::string> const& args) // expand the variable std::vector<std::string> varArgsExpanded; - std::vector<std::string> temp; - temp.push_back(std::string(cacheValue)); - cmSystemTools::ExpandListArguments(temp, varArgsExpanded); + cmSystemTools::ExpandListArgument(cacheValue, varArgsExpanded); // expand the args // check for REMOVE(VAR v1 v2 ... vn) std::vector<std::string> argsExpanded; - std::vector<std::string> temp2; + std::vector<std::string> temp; for(unsigned int j = 1; j < args.size(); ++j) { - temp2.push_back(args[j]); + temp.push_back(args[j]); } - cmSystemTools::ExpandListArguments(temp2, argsExpanded); + cmSystemTools::ExpandList(temp, argsExpanded); // now create the new value std::string value; |