summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-07 17:42:13 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-10 09:04:39 (GMT)
commit223d0efe55ff66f6ceb25ecdfbd1d915c76af548 (patch)
tree98d7c649c07079a7afe3a1b5a6f504074353f1b1
parenta367416cec8297c5a567825217b933f4539a44e4 (diff)
downloadCMake-223d0efe55ff66f6ceb25ecdfbd1d915c76af548.zip
CMake-223d0efe55ff66f6ceb25ecdfbd1d915c76af548.tar.gz
CMake-223d0efe55ff66f6ceb25ecdfbd1d915c76af548.tar.bz2
Remove some needless GetMakefile() calls.
-rw-r--r--Source/cmCustomCommandGenerator.cxx2
-rw-r--r--Source/cmGeneratorExpressionEvaluationFile.cxx2
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index 7f3b651..4b6bd50 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -101,7 +101,7 @@ cmCustomCommandGenerator
}
else
{
- cmOutputConverter converter(this->LG->GetMakefile()->GetStateSnapshot());
+ cmOutputConverter converter(this->LG->GetStateSnapshot());
cmd += converter.EscapeForShell(arg, this->MakeVars);
}
}
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index e4d9f10..8ac5cbc 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -139,7 +139,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator *lg)
{
std::ostringstream e;
e << "Evaluation file \"" << this->Input << "\" cannot be read.";
- lg->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str());
+ lg->IssueMessage(cmake::FATAL_ERROR, e.str());
return;
}
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index a8cef0e..bfb58f2 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -495,7 +495,7 @@ cmGlobalUnixMakefileGenerator3
// The directory-level rule should depend on the directory-level
// rules of the subdirectories.
std::vector<cmState::Snapshot> children
- = lg->GetMakefile()->GetStateSnapshot().GetChildren();
+ = lg->GetStateSnapshot().GetChildren();
for(std::vector<cmState::Snapshot>::const_iterator
ci = children.begin(); ci != children.end(); ++ci)
{