diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-03 09:41:29 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-03 09:41:59 (GMT) |
| commit | e1bdf5f5b2b15908b9f1c0486da45167933456f3 (patch) | |
| tree | b45081c327b66d9d71912ccbc497b1c12a91445a /Source | |
| parent | efcca9353f9af919625727a68b2f9c77995aed7f (diff) | |
| download | CMake-e1bdf5f5b2b15908b9f1c0486da45167933456f3.zip CMake-e1bdf5f5b2b15908b9f1c0486da45167933456f3.tar.gz CMake-e1bdf5f5b2b15908b9f1c0486da45167933456f3.tar.bz2 | |
cmMakefile: Use GetCMakeInstance.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 925554b..cee5bd0 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3727,8 +3727,7 @@ cmState *cmMakefile::GetState() const void cmMakefile::DisplayStatus(const char* message, float s) const { - cmake* cm = this->GetLocalGenerator()->GetGlobalGenerator() - ->GetCMakeInstance(); + cmake* cm = this->GetCMakeInstance(); if (cm->GetWorkingMode() == cmake::FIND_PACKAGE_MODE) { // don't output any STATUS message in FIND_PACKAGE_MODE, since they will @@ -4570,8 +4569,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg, // The conflict is with a non-imported target. // Allow this if the user has requested support. - cmake* cm = - this->LocalGenerator->GetGlobalGenerator()->GetCMakeInstance(); + cmake* cm = this->GetCMakeInstance(); if(isCustom && existing->GetType() == cmTarget::UTILITY && this != existing->GetMakefile() && cm->GetState() |