|
@@ -440,8 +440,8 @@ void cmGlobalXCodeGenerator::AddExtraTargets(
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- std::vector<cmGeneratorTarget*> tgts = lg->GetGeneratorTargets();
|
|
|
|
|
- for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
|
|
|
|
|
|
|
+ const std::vector<cmGeneratorTarget*>& tgts = lg->GetGeneratorTargets();
|
|
|
|
|
+ for (std::vector<cmGeneratorTarget*>::const_iterator l = tgts.begin();
|
|
|
l != tgts.end(); l++) {
|
|
l != tgts.end(); l++) {
|
|
|
cmGeneratorTarget* target = *l;
|
|
cmGeneratorTarget* target = *l;
|
|
|
|
|
|
|
@@ -925,12 +925,12 @@ bool cmGlobalXCodeGenerator::CreateXCodeTargets(
|
|
|
cmLocalGenerator* gen, std::vector<cmXCodeObject*>& targets)
|
|
cmLocalGenerator* gen, std::vector<cmXCodeObject*>& targets)
|
|
|
{
|
|
{
|
|
|
this->SetCurrentLocalGenerator(gen);
|
|
this->SetCurrentLocalGenerator(gen);
|
|
|
- std::vector<cmGeneratorTarget*> tgts =
|
|
|
|
|
|
|
+ const std::vector<cmGeneratorTarget*>& tgts =
|
|
|
this->CurrentLocalGenerator->GetGeneratorTargets();
|
|
this->CurrentLocalGenerator->GetGeneratorTargets();
|
|
|
typedef std::map<std::string, cmGeneratorTarget*, cmCompareTargets>
|
|
typedef std::map<std::string, cmGeneratorTarget*, cmCompareTargets>
|
|
|
cmSortedTargets;
|
|
cmSortedTargets;
|
|
|
cmSortedTargets sortedTargets;
|
|
cmSortedTargets sortedTargets;
|
|
|
- for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
|
|
|
|
|
|
|
+ for (std::vector<cmGeneratorTarget*>::const_iterator l = tgts.begin();
|
|
|
l != tgts.end(); l++) {
|
|
l != tgts.end(); l++) {
|
|
|
sortedTargets[(*l)->GetName()] = *l;
|
|
sortedTargets[(*l)->GetName()] = *l;
|
|
|
}
|
|
}
|
|
@@ -1210,7 +1210,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeTargets(
|
|
|
void cmGlobalXCodeGenerator::ForceLinkerLanguages()
|
|
void cmGlobalXCodeGenerator::ForceLinkerLanguages()
|
|
|
{
|
|
{
|
|
|
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) {
|
|
for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) {
|
|
|
- std::vector<cmGeneratorTarget*> tgts =
|
|
|
|
|
|
|
+ const std::vector<cmGeneratorTarget*>& tgts =
|
|
|
this->LocalGenerators[i]->GetGeneratorTargets();
|
|
this->LocalGenerators[i]->GetGeneratorTargets();
|
|
|
// All targets depend on the build-system check target.
|
|
// All targets depend on the build-system check target.
|
|
|
for (std::vector<cmGeneratorTarget*>::const_iterator ti = tgts.begin();
|
|
for (std::vector<cmGeneratorTarget*>::const_iterator ti = tgts.begin();
|
|
@@ -2706,8 +2706,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(
|
|
|
i != generators.end(); ++i) {
|
|
i != generators.end(); ++i) {
|
|
|
cmMakefile* mf = (*i)->GetMakefile();
|
|
cmMakefile* mf = (*i)->GetMakefile();
|
|
|
std::vector<cmSourceGroup> sourceGroups = mf->GetSourceGroups();
|
|
std::vector<cmSourceGroup> sourceGroups = mf->GetSourceGroups();
|
|
|
- std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets();
|
|
|
|
|
- for (std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
|
|
|
|
|
|
|
+ const std::vector<cmGeneratorTarget*>& tgts = (*i)->GetGeneratorTargets();
|
|
|
|
|
+ for (std::vector<cmGeneratorTarget*>::const_iterator l = tgts.begin();
|
|
|
l != tgts.end(); l++) {
|
|
l != tgts.end(); l++) {
|
|
|
cmGeneratorTarget* gtgt = *l;
|
|
cmGeneratorTarget* gtgt = *l;
|
|
|
|
|
|