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

cmMakefile: Remove Configured state.

Browse Source 
It is vestigial.
This commit is contained in:
Stephen Kelly 2015-09-26 22:18:52 +02:00
parent 5642449a69
commit 203eada65e
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmMakefile.cxx
View File

@ -54,7 +54,6 @@ cmMakefile::cmMakefile(cmGlobalGenerator* globalGenerator,
this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused(); this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars(); this->CheckSystemVars = this->GetCMakeInstance()->GetCheckSystemVars();
this->Configured = false;
this->SuppressWatches = false; this->SuppressWatches = false;
// Setup the default include file regular expression (match everything). // Setup the default include file regular expression (match everything).
@ -1658,7 +1657,6 @@ void cmMakefile::Configure()
cmParseFileScope pfs(this); cmParseFileScope pfs(this);
if (!listFile.ParseFile(currentStart.c_str(), this->IsRootMakefile(), this)) if (!listFile.ParseFile(currentStart.c_str(), this->IsRootMakefile(), this))
{ {
this->SetConfigured();
return; return;
} }
} }
@ -1679,7 +1677,6 @@ void cmMakefile::Configure()
} }
this->AddCMakeDependFilesFromUser(); this->AddCMakeDependFilesFromUser();
this->SetConfigured();
} }
void cmMakefile::ConfigureSubDirectory(cmMakefile *mf) void cmMakefile::ConfigureSubDirectory(cmMakefile *mf)
@ -1723,7 +1720,6 @@ void cmMakefile::ConfigureSubDirectory(cmMakefile *mf)
// NEW behavior prints the error. // NEW behavior prints the error.
this->IssueMessage(cmake::FATAL_ERROR, e.str()); this->IssueMessage(cmake::FATAL_ERROR, e.str());
} }
mf->SetConfigured();
return; return;
} }
// finally configure the subdir // finally configure the subdir

4
Source/cmMakefile.h
View File

@ -750,9 +750,6 @@ public:
cmStringRange GetCompileDefinitionsEntries() const; cmStringRange GetCompileDefinitionsEntries() const;
cmBacktraceRange GetCompileDefinitionsBacktraces() const; cmBacktraceRange GetCompileDefinitionsBacktraces() const;
bool IsConfigured() const { return this->Configured; }
void SetConfigured(){ this->Configured = true; }
void AddQtUiFileWithOptions(cmSourceFile *sf); void AddQtUiFileWithOptions(cmSourceFile *sf);
std::vector<cmSourceFile*> GetQtUiFilesWithOptions() const; std::vector<cmSourceFile*> GetQtUiFilesWithOptions() const;
@ -988,7 +985,6 @@ private:
bool WarnUnused; bool WarnUnused;
bool CheckSystemVars; bool CheckSystemVars;
bool CheckCMP0000; bool CheckCMP0000;
bool Configured;
bool IsSourceFileTryCompile; bool IsSourceFileTryCompile;
mutable bool SuppressWatches; mutable bool SuppressWatches;
}; };