cmLocalGenerator: Initialize state before creating cmMakefile.
Access the state from the local generator in the cmMakefile.
This commit is contained in:
parent
34c9ee2ed7
commit
76b598319f
|
@ -51,6 +51,13 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
|
|||
if (parent)
|
||||
{
|
||||
parent->AddChild(this);
|
||||
this->StateSnapshot =
|
||||
this->GetState()->CreateSnapshot(parent->StateSnapshot);
|
||||
}
|
||||
else
|
||||
{
|
||||
this->StateSnapshot =
|
||||
this->GetState()->CreateSnapshot(cmState::Snapshot(this->GetState()));
|
||||
}
|
||||
this->Makefile = new cmMakefile(this);
|
||||
|
||||
|
@ -573,6 +580,16 @@ void cmLocalGenerator::GenerateTargetManifest()
|
|||
}
|
||||
}
|
||||
|
||||
cmState* cmLocalGenerator::GetState() const
|
||||
{
|
||||
return this->GlobalGenerator->GetCMakeInstance()->GetState();
|
||||
}
|
||||
|
||||
cmState::Snapshot cmLocalGenerator::GetStateSnapshot() const
|
||||
{
|
||||
return this->StateSnapshot;
|
||||
}
|
||||
|
||||
void cmLocalGenerator::AddCustomCommandToCreateObject(const char* ofname,
|
||||
const std::string& lang,
|
||||
cmSourceFile& source,
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#define cmLocalGenerator_h
|
||||
|
||||
#include "cmStandardIncludes.h"
|
||||
#include "cmState.h"
|
||||
|
||||
class cmMakefile;
|
||||
class cmGlobalGenerator;
|
||||
|
@ -88,6 +89,9 @@ public:
|
|||
const cmGlobalGenerator *GetGlobalGenerator() const {
|
||||
return this->GlobalGenerator; }
|
||||
|
||||
cmState* GetState() const;
|
||||
cmState::Snapshot GetStateSnapshot() const;
|
||||
|
||||
/**
|
||||
* Convert something to something else. This is a centralized conversion
|
||||
* routine used by the generators to handle relative paths and the like.
|
||||
|
@ -442,6 +446,7 @@ protected:
|
|||
void ReadInputFile();
|
||||
|
||||
cmMakefile *Makefile;
|
||||
cmState::Snapshot StateSnapshot;
|
||||
cmGlobalGenerator *GlobalGenerator;
|
||||
std::vector<std::string> HomeDirectoryComponents;
|
||||
std::vector<std::string> StartDirectoryComponents;
|
||||
|
|
|
@ -153,27 +153,13 @@ public:
|
|||
cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
|
||||
: Internal(new Internals),
|
||||
LocalGenerator(localGenerator),
|
||||
StateSnapshot(localGenerator->GetGlobalGenerator()
|
||||
->GetCMakeInstance()->GetState())
|
||||
StateSnapshot(localGenerator->GetStateSnapshot())
|
||||
{
|
||||
this->Internal->PushDefinitions();
|
||||
this->Internal->VarInitStack.push(std::set<std::string>());
|
||||
this->Internal->VarUsageStack.push(std::set<std::string>());
|
||||
this->Internal->IsSourceFileTryCompile = false;
|
||||
|
||||
if (this->LocalGenerator->GetParent())
|
||||
{
|
||||
cmMakefile* parentMf = this->LocalGenerator->GetParent()->GetMakefile();
|
||||
this->StateSnapshot =
|
||||
this->GetState()->CreateSnapshot(parentMf->StateSnapshot);
|
||||
}
|
||||
else
|
||||
{
|
||||
this->StateSnapshot =
|
||||
this->GetState()->CreateSnapshot(this->StateSnapshot);
|
||||
}
|
||||
|
||||
|
||||
// Initialize these first since AddDefaultDefinitions calls AddDefinition
|
||||
this->WarnUnused = false;
|
||||
this->CheckSystemVars = false;
|
||||
|
|
Loading…
Reference in New Issue