Commit 27e11c6f authored by Stephen Kelly's avatar Stephen Kelly Committed by Brad King
Browse files

Merge Configure state with GeneratingBuildSystem state.

parent 363caa2f
......@@ -1280,7 +1280,6 @@ void cmGlobalGenerator::Generate()
// Generate project files
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
this->LocalGenerators[i]->GetMakefile()->SetGeneratingBuildSystem();
this->SetCurrentLocalGenerator(this->LocalGenerators[i]);
this->LocalGenerators[i]->Generate();
if(!this->LocalGenerators[i]->GetMakefile()->IsOn(
......
......@@ -59,7 +59,6 @@ cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
this->Makefile = new cmMakefile(this);
this->LinkScriptShell = false;
this->Configured = false;
this->EmitUniversalBinaryFlags = true;
this->BackwardsCompatibility = 0;
this->BackwardsCompatibilityFinal = false;
......@@ -128,7 +127,7 @@ void cmLocalGenerator::Configure()
std::vector<cmLocalGenerator *>::iterator sdi = subdirs.begin();
for (; sdi != subdirs.end(); ++sdi)
{
if (!(*sdi)->Configured)
if (!(*sdi)->GetMakefile()->IsConfigured())
{
this->Makefile->ConfigureSubDirectory(*sdi);
}
......@@ -138,7 +137,7 @@ void cmLocalGenerator::Configure()
this->ComputeObjectMaxPath();
this->Configured = true;
this->Makefile->SetConfigured();
}
//----------------------------------------------------------------------------
......@@ -3179,11 +3178,6 @@ bool cmLocalGenerator::IsNMake() const
return this->GetState()->UseNMake();
}
void cmLocalGenerator::SetConfiguredCMP0014(bool configured)
{
this->Configured = configured;
}
//----------------------------------------------------------------------------
std::string
cmLocalGenerator
......@@ -3465,7 +3459,7 @@ cmIML_INT_uint64_t cmLocalGenerator::GetBackwardsCompatibility()
}
}
this->BackwardsCompatibility = CMake_VERSION_ENCODE(major, minor, patch);
this->BackwardsCompatibilityFinal = this->Configured;
this->BackwardsCompatibilityFinal = this->Makefile->IsConfigured();
}
return this->BackwardsCompatibility;
......
......@@ -383,8 +383,6 @@ public:
bool IsMinGWMake() const;
bool IsNMake() const;
void SetConfiguredCMP0014(bool configured);
protected:
///! put all the libraries for a target on into the given stream
void OutputLinkLibraries(std::string& linkLibraries,
......@@ -451,7 +449,6 @@ protected:
std::set<cmTarget const*> WarnCMP0063;
bool LinkScriptShell;
bool Configured;
bool EmitUniversalBinaryFlags;
// Hack for ExpandRuleVariable until object-oriented version is
......
......@@ -146,7 +146,7 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
this->GeneratingBuildSystem = false;
this->Configured = false;
this->SuppressWatches = false;
// Setup the default include file regular expression (match everything).
......@@ -1594,7 +1594,7 @@ void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2)
// NEW behavior prints the error.
this->IssueMessage(cmake::FATAL_ERROR, e.str());
}
lg2->SetConfiguredCMP0014(true);
lg2->GetMakefile()->SetConfigured();
return;
}
// finally configure the subdir
......
......@@ -781,8 +781,8 @@ public:
return this->CompileDefinitionsEntries;
}
bool IsGeneratingBuildSystem() const { return this->GeneratingBuildSystem; }
void SetGeneratingBuildSystem(){ this->GeneratingBuildSystem = true; }
bool IsConfigured() const { return this->Configured; }
void SetConfigured(){ this->Configured = true; }
void AddQtUiFileWithOptions(cmSourceFile *sf);
std::vector<cmSourceFile*> GetQtUiFilesWithOptions() const;
......@@ -994,7 +994,7 @@ private:
long line,
bool removeEmpty,
bool replaceAt) const;
bool GeneratingBuildSystem;
bool Configured;
/**
* Old version of GetSourceFileWithOutput(const std::string&) kept for
* backward-compatibility. It implements a linear search and support
......
......@@ -764,7 +764,7 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
"SOURCES")
!= debugProperties.end();
if (this->Makefile->IsGeneratingBuildSystem())
if (this->Makefile->IsConfigured())
{
this->DebugSourcesDone = true;
}
......@@ -2106,7 +2106,7 @@ cmTarget::GetIncludeDirectories(const std::string& config,
"INCLUDE_DIRECTORIES")
!= debugProperties.end();
if (this->Makefile->IsGeneratingBuildSystem())
if (this->Makefile->IsConfigured())
{
this->DebugIncludesDone = true;
}
......@@ -2277,7 +2277,7 @@ void cmTarget::GetCompileOptions(std::vector<std::string> &result,
"COMPILE_OPTIONS")
!= debugProperties.end();
if (this->Makefile->IsGeneratingBuildSystem())
if (this->Makefile->IsConfigured())
{
this->DebugCompileOptionsDone = true;
}
......@@ -2348,7 +2348,7 @@ void cmTarget::GetCompileDefinitions(std::vector<std::string> &list,
"COMPILE_DEFINITIONS")
!= debugProperties.end();
if (this->Makefile->IsGeneratingBuildSystem())
if (this->Makefile->IsConfigured())
{
this->DebugCompileDefinitionsDone = true;
}
......@@ -2449,7 +2449,7 @@ void cmTarget::GetCompileFeatures(std::vector<std::string> &result,
"COMPILE_FEATURES")
!= debugProperties.end();
if (this->Makefile->IsGeneratingBuildSystem())
if (this->Makefile->IsConfigured())
{
this->DebugCompileFeaturesDone = true;
}
......@@ -4857,7 +4857,7 @@ cmTarget::ReportPropertyOrigin(const std::string &p,
p)
!= debugProperties.end();
if (this->Makefile->IsGeneratingBuildSystem())
if (this->Makefile->IsConfigured())
{
this->DebugCompatiblePropertiesDone[p] = true;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment