mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-12 23:43:59 +03:00
Code Activity

cmMakefile: Introduce a local cmMakefile variable.

Browse Source
This commit is contained in:
Stephen Kelly authored and Brad King committed 2015-06-04 09:06:42 -04:00
1 parent 4e8f242d17
commit 7657e8b1df
1 file changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefile.cxx
+7 -5
View File
@@ -1685,21 +1685,23 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,
->MakeLocalGenerator(newSnapshot, this->LocalGenerator);
this->GetGlobalGenerator()->AddLocalGenerator(lg2);
cmMakefile* subMf = lg2->GetMakefile();
// set the subdirs start dirs
lg2->GetMakefile()->SetCurrentSourceDirectory(srcPath);
lg2->GetMakefile()->SetCurrentBinaryDirectory(binPath);
subMf->SetCurrentSourceDirectory(srcPath);
subMf->SetCurrentBinaryDirectory(binPath);
if(excludeFromAll)
{
lg2->GetMakefile()->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
subMf->SetProperty("EXCLUDE_FROM_ALL", "TRUE");
}
if (immediate)
{
this->ConfigureSubDirectory(lg2->GetMakefile());
this->ConfigureSubDirectory(subMf);
}
else
{
this->UnConfiguredDirectories.push_back(lg2->GetMakefile());
this->UnConfiguredDirectories.push_back(subMf);
}
}