diff options
author | Stephen Kelly <steveire@gmail.com> | 2016-01-28 21:10:28 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-08-25 13:47:27 (GMT) |
commit | 1462576bcba68310395a7185e4b77da38e1e6b33 (patch) | |
tree | b2819f0255a864e547807d4b87b8d3e2d580ed5f /Source/cmMakefile.cxx | |
parent | 421012a330989a64b24a3289379bb4938e6ed3ea (diff) | |
download | CMake-1462576bcba68310395a7185e4b77da38e1e6b33.zip CMake-1462576bcba68310395a7185e4b77da38e1e6b33.tar.gz CMake-1462576bcba68310395a7185e4b77da38e1e6b33.tar.bz2 |
Parser: Port away from cmMakefile
It is an unneeded dependency.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 6c83b06..6e47797 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -25,6 +25,7 @@ #include "cmGlobalGenerator.h" #include "cmInstallGenerator.h" #include "cmListFileCache.h" +#include "cmMessenger.h" #include "cmSourceFile.h" #include "cmSourceFileLocation.h" #include "cmState.h" @@ -457,7 +458,8 @@ bool cmMakefile::ReadDependentFile(const char* filename, bool noPolicyScope) IncludeScope incScope(this, filenametoread, noPolicyScope); cmListFile listFile; - if (!listFile.ParseFile(filenametoread.c_str(), this)) { + if (!listFile.ParseFile(filenametoread.c_str(), this->GetMessenger(), + this->Backtrace)) { return false; } @@ -506,7 +508,8 @@ bool cmMakefile::ReadListFile(const char* filename) ListFileScope scope(this, filenametoread); cmListFile listFile; - if (!listFile.ParseFile(filenametoread.c_str(), this)) { + if (!listFile.ParseFile(filenametoread.c_str(), this->GetMessenger(), + this->Backtrace)) { return false; } @@ -1452,7 +1455,8 @@ void cmMakefile::Configure() this->AddDefinition("CMAKE_PARENT_LIST_FILE", currentStart.c_str()); cmListFile listFile; - if (!listFile.ParseFile(currentStart.c_str(), this)) { + if (!listFile.ParseFile(currentStart.c_str(), this->GetMessenger(), + this->Backtrace)) { return; } if (this->IsRootMakefile()) { @@ -3274,6 +3278,11 @@ cmake* cmMakefile::GetCMakeInstance() const return this->GlobalGenerator->GetCMakeInstance(); } +cmMessenger* cmMakefile::GetMessenger() const +{ + return this->GetCMakeInstance()->GetMessenger(); +} + cmGlobalGenerator* cmMakefile::GetGlobalGenerator() const { return this->GlobalGenerator; |