summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-03 09:05:27 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-03 09:05:27 (GMT)
commitefcca9353f9af919625727a68b2f9c77995aed7f (patch)
tree4c56d032bb955172b2f41e870b4f47a348e34dfa /Source
parent6cd6d50871ce28d0c72336a6aca01814487df5e1 (diff)
downloadCMake-efcca9353f9af919625727a68b2f9c77995aed7f.zip
CMake-efcca9353f9af919625727a68b2f9c77995aed7f.tar.gz
CMake-efcca9353f9af919625727a68b2f9c77995aed7f.tar.bz2
cmMakefile: Simplify GetCMakeInstance implementation.
No callers handle the possibility that it can return null, and that is no longer possible anyway.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmMakefile.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 5686b1b..925554b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3693,11 +3693,7 @@ bool cmMakefile::GetIsSourceFileTryCompile() const
cmake *cmMakefile::GetCMakeInstance() const
{
- if ( this->LocalGenerator && this->LocalGenerator->GetGlobalGenerator() )
- {
- return this->LocalGenerator->GetGlobalGenerator()->GetCMakeInstance();
- }
- return 0;
+ return this->LocalGenerator->GetGlobalGenerator()->GetCMakeInstance();
}
#ifdef CMAKE_BUILD_WITH_CMAKE