summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-03 09:08:21 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-03 09:41:59 (GMT)
commit0bb6dbe0c62f027af394f680f644041cfad7321f (patch)
tree28b26b9fab4319f3d6b5e6d2ced7d27998ee7510
parente1bdf5f5b2b15908b9f1c0486da45167933456f3 (diff)
downloadCMake-0bb6dbe0c62f027af394f680f644041cfad7321f.zip
CMake-0bb6dbe0c62f027af394f680f644041cfad7321f.tar.gz
CMake-0bb6dbe0c62f027af394f680f644041cfad7321f.tar.bz2
cmMakefile: Extract an accessor for the global generator.
Both for convenience, and because cmMakefile should not be the way to get access to the local generator, so that should go away in the future.
-rw-r--r--Source/cmMakefile.cxx7
-rw-r--r--Source/cmMakefile.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index cee5bd0..699c0ef 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3693,7 +3693,12 @@ bool cmMakefile::GetIsSourceFileTryCompile() const
cmake *cmMakefile::GetCMakeInstance() const
{
- return this->LocalGenerator->GetGlobalGenerator()->GetCMakeInstance();
+ return this->GetGlobalGenerator()->GetCMakeInstance();
+}
+
+cmGlobalGenerator* cmMakefile::GetGlobalGenerator() const
+{
+ return this->LocalGenerator->GetGlobalGenerator();
}
#ifdef CMAKE_BUILD_WITH_CMAKE
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8968e81..ad098ef 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -712,6 +712,7 @@ public:
* Get the instance
*/
cmake *GetCMakeInstance() const;
+ cmGlobalGenerator* GetGlobalGenerator() const;
/**
* Get all the source files this makefile knows about