|
@@ -759,13 +759,10 @@ cmMakefileTargetGenerator
|
|
|
if(const char* extra_outputs_str =
|
|
|
source.GetProperty("OBJECT_OUTPUTS"))
|
|
|
{
|
|
|
+ // Register these as extra files to clean.
|
|
|
cmSystemTools::ExpandListArgument(extra_outputs_str, outputs);
|
|
|
- for(std::vector<std::string>::const_iterator eoi = outputs.begin()+1;
|
|
|
- eoi != outputs.end(); ++eoi)
|
|
|
- {
|
|
|
- // Register this as an extra file to clean.
|
|
|
- this->CleanFiles.push_back(*eoi);
|
|
|
- }
|
|
|
+ this->CleanFiles.insert(this->CleanFiles.end(),
|
|
|
+ outputs.begin() + 1, outputs.end());
|
|
|
}
|
|
|
|
|
|
// Write the rule.
|
|
@@ -1174,11 +1171,7 @@ cmMakefileTargetGenerator
|
|
|
{
|
|
|
cmCustomCommandGenerator ccg(*cc, this->ConfigName, this->Makefile);
|
|
|
const std::vector<std::string>& outputs = ccg.GetOutputs();
|
|
|
- for(std::vector<std::string>::const_iterator o = outputs.begin();
|
|
|
- o != outputs.end(); ++o)
|
|
|
- {
|
|
|
- depends.push_back(*o);
|
|
|
- }
|
|
|
+ depends.insert(depends.end(), outputs.begin(), outputs.end());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1462,11 +1455,8 @@ void cmMakefileTargetGenerator::WriteTargetDriverRule(
|
|
|
}
|
|
|
|
|
|
// Make sure the extra files are built.
|
|
|
- for(std::set<std::string>::const_iterator i = this->ExtraFiles.begin();
|
|
|
- i != this->ExtraFiles.end(); ++i)
|
|
|
- {
|
|
|
- depends.push_back(*i);
|
|
|
- }
|
|
|
+ depends.insert(depends.end(),
|
|
|
+ this->ExtraFiles.begin(), this->ExtraFiles.end());
|
|
|
}
|
|
|
|
|
|
// Write the driver rule.
|
|
@@ -1553,11 +1543,7 @@ void cmMakefileTargetGenerator
|
|
|
if(cmComputeLinkInformation* cli = this->Target->GetLinkInformation(cfg))
|
|
|
{
|
|
|
std::vector<std::string> const& libDeps = cli->GetDepends();
|
|
|
- for(std::vector<std::string>::const_iterator j = libDeps.begin();
|
|
|
- j != libDeps.end(); ++j)
|
|
|
- {
|
|
|
- depends.push_back(*j);
|
|
|
- }
|
|
|
+ depends.insert(depends.end(), libDeps.begin(), libDeps.end());
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1577,12 +1563,8 @@ void cmMakefileTargetGenerator
|
|
|
}
|
|
|
|
|
|
// Add dependencies on the external object files.
|
|
|
- for(std::vector<std::string>::const_iterator obj
|
|
|
- = this->ExternalObjects.begin();
|
|
|
- obj != this->ExternalObjects.end(); ++obj)
|
|
|
- {
|
|
|
- depends.push_back(*obj);
|
|
|
- }
|
|
|
+ depends.insert(depends.end(),
|
|
|
+ this->ExternalObjects.begin(), this->ExternalObjects.end());
|
|
|
|
|
|
// Add a dependency on the rule file itself.
|
|
|
this->LocalGenerator->AppendRuleDepend(depends,
|