diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-05-30 21:50:28 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-06-04 13:06:41 (GMT) |
commit | a653611db0d6e23456c5ef90f95e19ea5d70a428 (patch) | |
tree | e8cea00b2f10069f82690df61616bcd6b2d54d08 /Source/cmGlobalGenerator.cxx | |
parent | 69a038a9e90a8839b69f4cb8826688be611e8b0d (diff) | |
download | CMake-a653611db0d6e23456c5ef90f95e19ea5d70a428.zip CMake-a653611db0d6e23456c5ef90f95e19ea5d70a428.tar.gz CMake-a653611db0d6e23456c5ef90f95e19ea5d70a428.tar.bz2 |
cmake: Replace CurrentLocalGenerator concept with CurrentMakefile.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r-- | Source/cmGlobalGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index d1842c1..1ee5500 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -70,7 +70,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm) this->TryCompileTimeout = 0; this->ExtraGenerator = 0; - this->CurrentLocalGenerator = 0; + this->CurrentMakefile = 0; this->TryCompileOuterMakefile = 0; } @@ -1281,7 +1281,7 @@ void cmGlobalGenerator::Generate() // Generate project files for (i = 0; i < this->LocalGenerators.size(); ++i) { - this->SetCurrentLocalGenerator(this->LocalGenerators[i]); + this->SetCurrentMakefile(this->LocalGenerators[i]->GetMakefile()); this->LocalGenerators[i]->Generate(); if(!this->LocalGenerators[i]->GetMakefile()->IsOn( "CMAKE_SKIP_INSTALL_RULES")) @@ -1293,7 +1293,7 @@ void cmGlobalGenerator::Generate() (static_cast<float>(i)+1.0f)/ static_cast<float>(this->LocalGenerators.size())); } - this->SetCurrentLocalGenerator(0); + this->SetCurrentMakefile(0); if(!this->GenerateCPackPropertiesFile()) { |