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

cmMakefile: Use GetCMakeInstance.

This commit is contained in:
Stephen Kelly 2015-05-03 11:41:29 +02:00
parent efcca9353f
commit e1bdf5f5b2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmMakefile.cxx
View File

@ -3727,8 +3727,7 @@ cmState *cmMakefile::GetState() const
void cmMakefile::DisplayStatus(const char* message, float s) const void cmMakefile::DisplayStatus(const char* message, float s) const
{ {
cmake* cm = this->GetLocalGenerator()->GetGlobalGenerator() cmake* cm = this->GetCMakeInstance();
->GetCMakeInstance();
if (cm->GetWorkingMode() == cmake::FIND_PACKAGE_MODE) if (cm->GetWorkingMode() == cmake::FIND_PACKAGE_MODE)
{ {
// don't output any STATUS message in FIND_PACKAGE_MODE, since they will // 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. // The conflict is with a non-imported target.
// Allow this if the user has requested support. // Allow this if the user has requested support.
cmake* cm = cmake* cm = this->GetCMakeInstance();
this->LocalGenerator->GetGlobalGenerator()->GetCMakeInstance();
if(isCustom && existing->GetType() == cmTarget::UTILITY && if(isCustom && existing->GetType() == cmTarget::UTILITY &&
this != existing->GetMakefile() && this != existing->GetMakefile() &&
cm->GetState() cm->GetState()