kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some temporary vectors for ExpandListArgument. 

Expand directly into the target when possible.
This commit is contained in:
Stephen Kelly 2014-12-18 21:03:38 +01:00
parent 0f99feec04
commit e2a489c76a
3 changed files with 8 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Source/CTest/cmCTestTestHandler.cxx
View File

@ -2153,25 +2153,11 @@ bool cmCTestTestHandler::SetTestsProperties(
} }
if ( key == "ATTACHED_FILES" ) if ( key == "ATTACHED_FILES" )
{ {
std::vector<std::string> lval; cmSystemTools::ExpandListArgument(val, rtit->AttachedFiles);
cmSystemTools::ExpandListArgument(val, lval);
for(std::vector<std::string>::iterator f = lval.begin();
f != lval.end(); ++f)
{
rtit->AttachedFiles.push_back(*f);
}
} }
if ( key == "ATTACHED_FILES_ON_FAIL" ) if ( key == "ATTACHED_FILES_ON_FAIL" )
{ {
std::vector<std::string> lval; cmSystemTools::ExpandListArgument(val, rtit->AttachOnFail);
cmSystemTools::ExpandListArgument(val, lval);
for(std::vector<std::string>::iterator f = lval.begin();
f != lval.end(); ++f)
{
rtit->AttachOnFail.push_back(*f);
}
} }
if ( key == "RESOURCE_LOCK" ) if ( key == "RESOURCE_LOCK" )
{ {
@ -2195,14 +2181,7 @@ bool cmCTestTestHandler::SetTestsProperties(
} }
if ( key == "REQUIRED_FILES" ) if ( key == "REQUIRED_FILES" )
{ {
std::vector<std::string> lval; cmSystemTools::ExpandListArgument(val, rtit->RequiredFiles);
cmSystemTools::ExpandListArgument(val, lval);
for(std::vector<std::string>::iterator f = lval.begin();
f != lval.end(); ++f)
{
rtit->RequiredFiles.push_back(*f);
}
} }
if ( key == "RUN_SERIAL" ) if ( key == "RUN_SERIAL" )
{ {
@ -2239,33 +2218,15 @@ bool cmCTestTestHandler::SetTestsProperties(
} }
if ( key == "DEPENDS" ) if ( key == "DEPENDS" )
{ {
std::vector<std::string> lval; cmSystemTools::ExpandListArgument(val, rtit->Depends);
cmSystemTools::ExpandListArgument(val, lval);
std::vector<std::string>::iterator crit;
for ( crit = lval.begin(); crit != lval.end(); ++ crit )
{
rtit->Depends.push_back(*crit);
}
} }
if ( key == "ENVIRONMENT" ) if ( key == "ENVIRONMENT" )
{ {
std::vector<std::string> lval; cmSystemTools::ExpandListArgument(val, rtit->Environment);
cmSystemTools::ExpandListArgument(val, lval);
std::vector<std::string>::iterator crit;
for ( crit = lval.begin(); crit != lval.end(); ++ crit )
{
rtit->Environment.push_back(*crit);
}
} }
if ( key == "LABELS" ) if ( key == "LABELS" )
{ {
std::vector<std::string> lval; cmSystemTools::ExpandListArgument(val, rtit->Labels);
cmSystemTools::ExpandListArgument(val, lval);
std::vector<std::string>::iterator crit;
for ( crit = lval.begin(); crit != lval.end(); ++ crit )
{
rtit->Labels.push_back(*crit);
}
} }
if ( key == "MEASUREMENT" ) if ( key == "MEASUREMENT" )
{ {

8
Source/cmMakefileTargetGenerator.cxx
View File

@ -1193,13 +1193,7 @@ void cmMakefileTargetGenerator
depends.push_back(source.GetFullPath()); depends.push_back(source.GetFullPath());
if(const char* objectDeps = source.GetProperty("OBJECT_DEPENDS")) if(const char* objectDeps = source.GetProperty("OBJECT_DEPENDS"))
{ {
std::vector<std::string> deps; cmSystemTools::ExpandListArgument(objectDeps, depends);
cmSystemTools::ExpandListArgument(objectDeps, deps);
for(std::vector<std::string>::iterator i = deps.begin();
i != deps.end(); ++i)
{
depends.push_back(*i);
}
} }
} }

9
Source/cmQtAutoGenerators.cxx
View File

@ -2368,14 +2368,7 @@ bool cmQtAutoGenerators::GenerateQrc()
= this->RccOptions.find(*si); = this->RccOptions.find(*si);
if (optionIt != this->RccOptions.end()) if (optionIt != this->RccOptions.end())
{ {
std::vector<std::string> opts; cmSystemTools::ExpandListArgument(optionIt->second, command);
cmSystemTools::ExpandListArgument(optionIt->second, opts);
for(std::vector<std::string>::const_iterator optIt = opts.begin();
optIt != opts.end();
++optIt)
{
command.push_back(*optIt);
}
} }
command.push_back("-name"); command.push_back("-name");