cmMakefile: Create the local generator after configuring the makefile.
The local generator is not used during configure time.
This commit is contained in:
parent
934aa454d0
commit
8a88089bbe
|
@ -1756,11 +1756,6 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
|
|||
cmMakefile* subMf = new cmMakefile(this->GlobalGenerator, newSnapshot);
|
||||
this->GetGlobalGenerator()->AddMakefile(subMf);
|
||||
|
||||
// create a new local generator and set its parent
|
||||
cmLocalGenerator *lg2 = this->GetGlobalGenerator()
|
||||
->CreateLocalGenerator(subMf);
|
||||
this->GetGlobalGenerator()->AddLocalGenerator(lg2);
|
||||
|
||||
// set the subdirs start dirs
|
||||
subMf->SetCurrentSourceDirectory(srcPath);
|
||||
subMf->SetCurrentBinaryDirectory(binPath);
|
||||
|
@ -1777,6 +1772,11 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
|
|||
{
|
||||
this->UnConfiguredDirectories.push_back(subMf);
|
||||
}
|
||||
|
||||
// create a new local generator and set its parent
|
||||
cmLocalGenerator *lg2 = this->GetGlobalGenerator()
|
||||
->CreateLocalGenerator(subMf);
|
||||
this->GetGlobalGenerator()->AddLocalGenerator(lg2);
|
||||
}
|
||||
|
||||
void cmMakefile::SetCurrentSourceDirectory(const std::string& dir)
|
||||
|
|
Loading…
Reference in New Issue