Merge topic 'minor-cleanups'

7f551b4f cmGlobalGenerator: Implement VS6 check without virtual method.
cd6293cd cmMakefile: Fix style.
de6b2895 cmTarget: Remove vestigal method declaration.
e35ee02d cmTarget: Fix indentation.
00f2298f Reduce uses of cmMakefile::GetGlobalGenerator.
6254ba95 cmMakefile: Remove Internal class.
cf0a78dc cmGeneratorTarget: Issue messages through the local generator.

1 files changed, 10 insertions, 16 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index dbf41cc..4a4663a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -43,19 +43,12 @@
 #include <ctype.h> // for isspace
 #include <assert.h>
 
-class cmMakefile::Internals
-{
-public:
-  bool IsSourceFileTryCompile;
-};
-
 // default is not to be building executables
 cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
-  : Internal(new Internals),
-    LocalGenerator(localGenerator),
+  : LocalGenerator(localGenerator),
     StateSnapshot(localGenerator->GetStateSnapshot())
 {
-  this->Internal->IsSourceFileTryCompile = false;
+  this->IsSourceFileTryCompile = false;
 
   // Initialize these first since AddDefaultDefinitions calls AddDefinition
   this->WarnUnused = this->GetCMakeInstance()->GetWarnUnused();
@@ -2083,7 +2076,8 @@ void cmMakefile::AddGlobalLinkInformation(const std::string& name,
       if(std::find(this->LinkDirectories.begin(),
                    this->LinkDirectories.end(), newdir)
           == this->LinkDirectories.end())
-        {target.AddLinkDirectory(*j);
+        {
+        target.AddLinkDirectory(*j);
         }
       }
     }
@@ -3620,7 +3614,7 @@ int cmMakefile::TryCompile(const std::string& srcdir,
                            const std::vector<std::string> *cmakeArgs,
                            std::string& output)
 {
-  this->Internal->IsSourceFileTryCompile = fast;
+  this->IsSourceFileTryCompile = fast;
   // does the binary directory exist ? If not create it...
   if (!cmSystemTools::FileIsDirectory(bindir))
     {
@@ -3645,7 +3639,7 @@ int cmMakefile::TryCompile(const std::string& srcdir,
       "Internal CMake error, TryCompile bad GlobalGenerator");
     // return to the original directory
     cmSystemTools::ChangeDirectory(cwd);
-    this->Internal->IsSourceFileTryCompile = false;
+    this->IsSourceFileTryCompile = false;
     return 1;
     }
   cm.SetGlobalGenerator(gg);
@@ -3716,7 +3710,7 @@ int cmMakefile::TryCompile(const std::string& srcdir,
       "Internal CMake error, TryCompile configure of cmake failed");
     // return to the original directory
     cmSystemTools::ChangeDirectory(cwd);
-    this->Internal->IsSourceFileTryCompile = false;
+    this->IsSourceFileTryCompile = false;
     return 1;
     }
 
@@ -3726,7 +3720,7 @@ int cmMakefile::TryCompile(const std::string& srcdir,
       "Internal CMake error, TryCompile generation of cmake failed");
     // return to the original directory
     cmSystemTools::ChangeDirectory(cwd);
-    this->Internal->IsSourceFileTryCompile = false;
+    this->IsSourceFileTryCompile = false;
     return 1;
     }
 
@@ -3739,13 +3733,13 @@ int cmMakefile::TryCompile(const std::string& srcdir,
                                                    this);
 
   cmSystemTools::ChangeDirectory(cwd);
-  this->Internal->IsSourceFileTryCompile = false;
+  this->IsSourceFileTryCompile = false;
   return ret;
 }
 
 bool cmMakefile::GetIsSourceFileTryCompile() const
 {
-  return this->Internal->IsSourceFileTryCompile;
+  return this->IsSourceFileTryCompile;
 }
 
 cmake *cmMakefile::GetCMakeInstance() const