diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-02 22:57:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-04 13:06:42 (GMT) |
| commit | 7657e8b1df64ed3b5429be34416e8756b659d525 (patch) | |
| tree | 50c60d72b24e1f7e9b1444e275629e71c302bc46 /Source/cmMakefile.cxx | |
| parent | 4e8f242d170ab46d4071254a3a81f7db264b8bc7 (diff) | |
| download | CMake-7657e8b1df64ed3b5429be34416e8756b659d525.zip CMake-7657e8b1df64ed3b5429be34416e8756b659d525.tar.gz CMake-7657e8b1df64ed3b5429be34416e8756b659d525.tar.bz2 | |
cmMakefile: Introduce a local cmMakefile variable.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ae9fe32..7e103bc 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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); } } |