diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-06-21 20:46:42 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-06-30 21:14:17 (GMT) |
commit | 276c62253e3f25eda4acbf0049a70c7d622c9ea2 (patch) | |
tree | a21b8c6c8a06566da93e602a343b842a87308b56 | |
parent | 7e3ac12df45fa42b590971accaf1db89b1a0ffb6 (diff) | |
download | CMake-276c62253e3f25eda4acbf0049a70c7d622c9ea2.zip CMake-276c62253e3f25eda4acbf0049a70c7d622c9ea2.tar.gz CMake-276c62253e3f25eda4acbf0049a70c7d622c9ea2.tar.bz2 |
cmMakefile: Move the IncludeScope to where it is used.
-rw-r--r-- | Source/cmMakefile.cxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index a3ba134..5225605 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -405,6 +405,26 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff, return result; } +bool cmMakefile::ProcessBuildsystemFile(const char* filename) +{ + this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename); + std::string curSrc = this->GetCurrentSourceDirectory(); + + this->ListFileStack.push_back(filename); + + cmListFile listFile; + if (!listFile.ParseFile(filename, curSrc == this->GetHomeDirectory(), this)) + { + return false; + } + + this->PushPolicyBarrier(); + this->ReadListFile(listFile, filename); + this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured()); + this->EnforceDirectoryLevelRules(); + return true; +} + //---------------------------------------------------------------------------- class cmMakefile::IncludeScope { @@ -532,26 +552,6 @@ void cmMakefile::IncludeScope::EnforceCMP0011() } } -bool cmMakefile::ProcessBuildsystemFile(const char* filename) -{ - this->AddDefinition("CMAKE_PARENT_LIST_FILE", filename); - std::string curSrc = this->GetCurrentSourceDirectory(); - - this->ListFileStack.push_back(filename); - - cmListFile listFile; - if (!listFile.ParseFile(filename, curSrc == this->GetHomeDirectory(), this)) - { - return false; - } - - this->PushPolicyBarrier(); - this->ReadListFile(listFile, filename); - this->PopPolicyBarrier(!cmSystemTools::GetFatalErrorOccured()); - this->EnforceDirectoryLevelRules(); - return true; -} - bool cmMakefile::ReadDependentFile(const char* filename, bool noPolicyScope) { this->AddDefinition("CMAKE_PARENT_LIST_FILE", |