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

cmGlobalGenerator: Avoid cmLocalGenerator until after Configure.

This commit is contained in:
Stephen Kelly 2015-08-02 12:08:49 +02:00
parent ff8ac8ee6a
commit bd096d30e0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGlobalGenerator.cxx
View File

@ -1134,17 +1134,17 @@ void cmGlobalGenerator::Configure()
this->LocalGenerators.push_back(lg); this->LocalGenerators.push_back(lg);
// set the Start directories // set the Start directories
lg->GetMakefile()->SetCurrentSourceDirectory dirMf->SetCurrentSourceDirectory
(this->CMakeInstance->GetHomeDirectory()); (this->CMakeInstance->GetHomeDirectory());
lg->GetMakefile()->SetCurrentBinaryDirectory dirMf->SetCurrentBinaryDirectory
(this->CMakeInstance->GetHomeOutputDirectory()); (this->CMakeInstance->GetHomeOutputDirectory());
this->BinaryDirectories.insert( this->BinaryDirectories.insert(
this->CMakeInstance->GetHomeOutputDirectory()); this->CMakeInstance->GetHomeOutputDirectory());
// now do it // now do it
lg->GetMakefile()->Configure(); dirMf->Configure();
lg->GetMakefile()->EnforceDirectoryLevelRules(); dirMf->EnforceDirectoryLevelRules();
// 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