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

cmMakefile: Remove cmLocalGenerator member.

This commit is contained in:
Stephen Kelly 2015-08-02 11:20:28 +02:00
parent 9b6a743b80
commit 83b8a927e5
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalGenerator.cxx
View File

@ -49,7 +49,7 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
assert(snapshot.IsValid()); assert(snapshot.IsValid());
this->GlobalGenerator = gg; this->GlobalGenerator = gg;
this->Makefile = new cmMakefile(this); this->Makefile = new cmMakefile(gg, snapshot);
this->EmitUniversalBinaryFlags = true; this->EmitUniversalBinaryFlags = true;
this->BackwardsCompatibility = 0; this->BackwardsCompatibility = 0;

11
Source/cmMakefile.cxx
View File

@ -44,9 +44,10 @@
#include <assert.h> #include <assert.h>
// default is not to be building executables // default is not to be building executables
cmMakefile::cmMakefile(cmLocalGenerator* localGenerator) cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
: LocalGenerator(localGenerator), cmState::Snapshot const& snapshot)
StateSnapshot(localGenerator->GetStateSnapshot()) : GlobalGenerator(globalGenerator),
StateSnapshot(snapshot)
{ {
this->IsSourceFileTryCompile = false; this->IsSourceFileTryCompile = false;
@ -3744,12 +3745,12 @@ bool cmMakefile::GetIsSourceFileTryCompile() const
cmake *cmMakefile::GetCMakeInstance() const cmake *cmMakefile::GetCMakeInstance() const
{ {
return this->GetGlobalGenerator()->GetCMakeInstance(); return this->GlobalGenerator->GetCMakeInstance();
} }
cmGlobalGenerator* cmMakefile::GetGlobalGenerator() const cmGlobalGenerator* cmMakefile::GetGlobalGenerator() const
{ {
return this->LocalGenerator->GetGlobalGenerator(); return this->GlobalGenerator;
} }
#ifdef CMAKE_BUILD_WITH_CMAKE #ifdef CMAKE_BUILD_WITH_CMAKE

6
Source/cmMakefile.h
View File

@ -42,7 +42,6 @@
class cmFunctionBlocker; class cmFunctionBlocker;
class cmCommand; class cmCommand;
class cmInstallGenerator; class cmInstallGenerator;
class cmLocalGenerator;
class cmMakeDepend; class cmMakeDepend;
class cmSourceFile; class cmSourceFile;
class cmTest; class cmTest;
@ -71,7 +70,8 @@ public:
/** /**
* Construct an empty makefile. * Construct an empty makefile.
*/ */
cmMakefile(cmLocalGenerator* localGenerator); cmMakefile(cmGlobalGenerator* globalGenerator,
const cmState::Snapshot& snapshot);
/** /**
* Destructor. * Destructor.
@ -856,7 +856,7 @@ protected:
#endif #endif
std::vector<cmCommand*> FinalPassCommands; std::vector<cmCommand*> FinalPassCommands;
cmLocalGenerator* LocalGenerator; cmGlobalGenerator* GlobalGenerator;
bool IsFunctionBlocked(const cmListFileFunction& lff, bool IsFunctionBlocked(const cmListFileFunction& lff,
cmExecutionStatus &status); cmExecutionStatus &status);