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

cmGlobalGenerator: Create global targets directly after Configure.

This commit is contained in:
Stephen Kelly 2015-08-02 12:59:06 +02:00
parent 3e08b4df95
commit 2b9a25d7f7
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/cmGlobalGenerator.cxx
View File

@ -1146,6 +1146,22 @@ void cmGlobalGenerator::Configure()
dirMf->Configure(); dirMf->Configure();
dirMf->EnforceDirectoryLevelRules(); dirMf->EnforceDirectoryLevelRules();
// Put a copy of each global target in every directory.
cmTargets globalTargets;
this->CreateDefaultGlobalTargets(&globalTargets);
for (unsigned int i = 0; i < this->Makefiles.size(); ++i)
{
cmMakefile* mf = this->Makefiles[i];
cmTargets* targets = &(mf->GetTargets());
cmTargets::iterator tit;
for ( tit = globalTargets.begin(); tit != globalTargets.end(); ++ tit )
{
(*targets)[tit->first] = tit->second;
(*targets)[tit->first].SetMakefile(mf);
}
}
// update the cache entry for the number of local generators, this is used // update the cache entry for the number of local generators, this is used
// for progress // for progress
char num[100]; char num[100];
@ -1183,25 +1199,6 @@ void cmGlobalGenerator::Configure()
} }
this->CMakeInstance->UpdateProgress(msg.str().c_str(), -1); this->CMakeInstance->UpdateProgress(msg.str().c_str(), -1);
} }
unsigned int i;
// Put a copy of each global target in every directory.
cmTargets globalTargets;
this->CreateDefaultGlobalTargets(&globalTargets);
for (i = 0; i < this->Makefiles.size(); ++i)
{
cmMakefile* mf = this->Makefiles[i];
cmTargets* targets = &(mf->GetTargets());
cmTargets::iterator tit;
for ( tit = globalTargets.begin(); tit != globalTargets.end(); ++ tit )
{
(*targets)[tit->first] = tit->second;
(*targets)[tit->first].SetMakefile(mf);
}
}
} }
void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes) void cmGlobalGenerator::CreateGenerationObjects(TargetTypes targetTypes)