summaryrefslogtreecommitdiff
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-08-02 11:20:28 +0200
committerStephen Kelly <steveire@gmail.com>2015-08-28 18:44:38 +0200
commit83b8a927e5a992480e96b0be36ea0426a924c41f (patch)
treefe0a57626ae02b489dc31dbc9df04df7720c30a8 /Source/cmMakefile.cxx
parent9b6a743b801dffa9f7ccab0c3e73fa8d22f3b8b9 (diff)
downloadcmake-83b8a927e5a992480e96b0be36ea0426a924c41f.tar.gz
cmMakefile: Remove cmLocalGenerator member.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2ba12a48f4..10ce0b3c8e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -44,9 +44,10 @@
#include <assert.h>
// default is not to be building executables
-cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
- : LocalGenerator(localGenerator),
- StateSnapshot(localGenerator->GetStateSnapshot())
+cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
+ cmState::Snapshot const& snapshot)
+ : GlobalGenerator(globalGenerator),
+ StateSnapshot(snapshot)
{
this->IsSourceFileTryCompile = false;
@@ -3744,12 +3745,12 @@ bool cmMakefile::GetIsSourceFileTryCompile() const
cmake *cmMakefile::GetCMakeInstance() const
{
- return this->GetGlobalGenerator()->GetCMakeInstance();
+ return this->GlobalGenerator->GetCMakeInstance();
}
cmGlobalGenerator* cmMakefile::GetGlobalGenerator() const
{
- return this->LocalGenerator->GetGlobalGenerator();
+ return this->GlobalGenerator;
}
#ifdef CMAKE_BUILD_WITH_CMAKE