Merge topic 'minor-cleanups'

22d09ecf cmLocalGenerator: Remove ConfigureFinalPass.
821a711b project(): Remove unused variable.

Source/cmGlobalGenerator.cxx

@@ -1540,7 +1540,7 @@ void cmGlobalGenerator::CheckLocalGenerators()
   cmState* state = this->GetCMakeInstance()->GetState();
   for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
     {
-    this->LocalGenerators[i]->ConfigureFinalPass();
+    this->LocalGenerators[i]->GetMakefile()->ConfigureFinalPass();
     cmTargets &targets =
       this->LocalGenerators[i]->GetMakefile()->GetTargets();
     for (cmTargets::iterator l = targets.begin();

Source/cmLocalGenerator.cxx

@@ -113,11 +113,6 @@ void cmLocalGenerator::ComputeObjectMaxPath()
   this->ObjectMaxPathViolations.clear();
 }
 
-void cmLocalGenerator::ConfigureFinalPass()
-{
-  this->Makefile->ConfigureFinalPass();
-}
-
 void cmLocalGenerator::TraceDependencies()
 {
   std::vector<std::string> configs;

Source/cmLocalGenerator.h

@@ -54,11 +54,6 @@ public:
 
   virtual void AddHelperCommands() {}
 
-  /**
-   * Perform any final calculations prior to generation
-   */
-  void ConfigureFinalPass();
-
   /**
    * Generate the install rules files in this directory.
    */

Source/cmProjectCommand.cxx

@@ -233,7 +233,6 @@ bool cmProjectCommand
   const char* include = this->Makefile->GetDefinition(extraInclude);
   if(include)
     {
-    std::string fullFilePath;
     bool readit =
       this->Makefile->ReadDependentFile(include);
     if(!readit && !cmSystemTools::GetFatalErrorOccured())