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

cmMakefile: Introduce a local cmMakefile variable.

This commit is contained in:
Stephen Kelly 2015-06-03 00:57:31 +02:00 committed by Brad King
parent 4e8f242d17
commit 7657e8b1df
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmMakefile.cxx
View File

@ -1685,21 +1685,23 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
->MakeLocalGenerator(newSnapshot, this->LocalGenerator); ->MakeLocalGenerator(newSnapshot, this->LocalGenerator);
this->GetGlobalGenerator()->AddLocalGenerator(lg2); this->GetGlobalGenerator()->AddLocalGenerator(lg2);
cmMakefile* subMf = lg2->GetMakefile();
// set the subdirs start dirs // set the subdirs start dirs
lg2->GetMakefile()->SetCurrentSourceDirectory(srcPath); subMf->SetCurrentSourceDirectory(srcPath);
lg2->GetMakefile()->SetCurrentBinaryDirectory(binPath); subMf->SetCurrentBinaryDirectory(binPath);
if(excludeFromAll) if(excludeFromAll)
{ {
lg2->GetMakefile()->SetProperty("EXCLUDE_FROM_ALL", "TRUE"); subMf->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
} }
if (immediate) if (immediate)
{ {
this->ConfigureSubDirectory(lg2->GetMakefile()); this->ConfigureSubDirectory(subMf);
} }
else else
{ {
this->UnConfiguredDirectories.push_back(lg2->GetMakefile()); this->UnConfiguredDirectories.push_back(subMf);
} }
} }