mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-23 07:28:51 -06:00
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.
This commit is contained in:
@@ -40,19 +40,17 @@ bool cmSourceFilesRemoveCommand::InitialPass(std::vector<std::string> const& arg
|
||||
|
||||
// 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;
|
||||
|
||||
Reference in New Issue
Block a user