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.

9 files changed, 25 insertions, 34 deletions

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 59590fd..1e02ae4 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -12,6 +12,7 @@
 #include "cmComputeLinkDepends.h"
 
 #include "cmComputeComponentGraph.h"
+#include "cmLocalGenerator.h"
 #include "cmGlobalGenerator.h"
 #include "cmMakefile.h"
 #include "cmTarget.h"
@@ -177,7 +178,8 @@ cmComputeLinkDepends
   // Store context information.
   this->Target = target;
   this->Makefile = this->Target->Target->GetMakefile();
-  this->GlobalGenerator = this->Makefile->GetGlobalGenerator();
+  this->GlobalGenerator =
+      this->Target->GetLocalGenerator()->GetGlobalGenerator();
   this->CMakeInstance = this->GlobalGenerator->GetCMakeInstance();
 
   // The configuration being linked.
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 6ba0eed..6c3822f 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -769,7 +769,7 @@ void cmComputeLinkInformation::AddSharedDepItem(std::string const& item,
   std::string lib;
   if(tgt)
     {
-    gtgt = tgt->GetMakefile()->GetGlobalGenerator()->GetGeneratorTarget(tgt);
+    gtgt = this->GlobalGenerator->GetGeneratorTarget(tgt);
 
     lib = gtgt->GetFullPath(this->Config, this->UseImportLibrary);
     this->AddLibraryRuntimeInfo(lib, tgt);
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index dd58e7b..25fc8a7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1228,7 +1228,7 @@ public:
       : Preference(0), Target(target)
     {
     this->Makefile = this->Target->Makefile;
-    this->GG = this->Makefile->GetGlobalGenerator();
+    this->GG = this->Target->GetLocalGenerator()->GetGlobalGenerator();
     }
   void Consider(const char* lang)
     {
@@ -1403,7 +1403,7 @@ cmGeneratorTarget::CompileInfo const* cmGeneratorTarget::GetCompileInfo(
     msg += this->GetName();
     msg += " which has type ";
     msg += cmTarget::GetTargetTypeName(this->Target->GetType());
-    this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, msg);
+    this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     return 0;
     }
 
@@ -2093,7 +2093,7 @@ cmGeneratorTarget::NormalGetRealName(const std::string& config) const
     {
     std::string msg =  "NormalGetRealName called on imported target: ";
     msg += this->GetName();
-    this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, msg);
+    this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
     }
 
   if(this->GetType() == cmTarget::EXECUTABLE)
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 23501bc..21cbd44 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -242,7 +242,7 @@ public:
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
   /** Is this the Visual Studio 6 generator?  */
-  virtual bool IsForVS6() const { return false; }
+  bool IsForVS6() const { return this->GetName() == "Visual Studio 6"; }
 #endif
 
   ///! Find a target by name by searching the local generators.
diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h
index 2460158..420cb0b 100644
--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@@ -85,8 +85,6 @@ public:
 
   virtual void FindMakeProgram(cmMakefile*);
 
-  virtual bool IsForVS6() const { return true; }
-
 protected:
   virtual void Generate();
   virtual const char* GetIDEVersion() { return "6.0"; }
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
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 81bb510..f3839aa 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -62,8 +62,6 @@ class cmGeneratorExpressionEvaluationFile;
  */
 class cmMakefile
 {
-  class Internals;
-  cmsys::auto_ptr<Internals> Internal;
 public:
   /* Mark a variable as used */
   void MarkVariableAsUsed(const std::string& var);
@@ -991,6 +989,7 @@ private:
   bool CheckSystemVars;
   bool CheckCMP0000;
   bool Configured;
+  bool IsSourceFileTryCompile;
   mutable bool SuppressWatches;
 };
 
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 49b3239..747f465 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1842,12 +1842,12 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
       return;
       }
-      this->Internal->SourceFilesMap.clear();
-      cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-      cmGeneratorExpression ge(lfbt);
-      cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
-      this->Internal->SourceEntries.push_back(
-                            new cmTargetInternals::TargetPropertyEntry(cge));
+    this->Internal->SourceFilesMap.clear();
+    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
+    cmGeneratorExpression ge(lfbt);
+    cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
+    this->Internal->SourceEntries.push_back(
+                          new cmTargetInternals::TargetPropertyEntry(cge));
     }
   else
     {
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2007b40..dccf550 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -614,8 +614,6 @@ private:
 
   void MaybeInvalidatePropertyCache(const std::string& prop);
 
-  void ProcessSourceExpression(std::string const& expr);
-
   // Internal representation details.
   friend class cmTargetInternals;
   friend class cmGeneratorTarget;