Explorar el Código

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.
Stephen Kelly hace 10 años
padre
commit
0bb6dbe0c6
Se han modificado 2 ficheros con 7 adiciones y 1 borrados
  1. 6 1
      Source/cmMakefile.cxx
  2. 1 0
      Source/cmMakefile.h

+ 6 - 1
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

+ 1 - 0
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