Merge topic 'minor-cleanups'

ed77c5c5 cmQtAutoGeneratorInitializer: Remove unused local variable
b398e716 cmVisualStudio10TargetGenerator: Remove shadowing local variable
da2330bd cmVisualStudio10ToolsetOptions: Remove unused include

Acked-by: Kitware Robot <[email protected]>
Merge-request: !910

Source/cmQtAutoGeneratorInitializer.cxx

@@ -790,8 +790,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
   bool usePRE_BUILD = false;
   cmGlobalGenerator* gg = lg->GetGlobalGenerator();
   if (gg->GetName().find("Visual Studio") != std::string::npos) {
-    cmGlobalVisualStudioGenerator* vsgg =
-      static_cast<cmGlobalVisualStudioGenerator*>(gg);
     // Under VS use a PRE_BUILD event instead of a separate target to
     // reduce the number of targets loaded into the IDE.
     // This also works around a VS 11 bug that may skip updating the target:

Source/cmVisualStudio10TargetGenerator.cxx

@@ -3154,8 +3154,6 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
   // FIXME: Select flag table based on toolset instead of VS version.
   if (this->LocalGenerator->GetVersion() >=
       cmGlobalVisualStudioGenerator::VS14) {
-    cmGlobalVisualStudio10Generator* gg =
-      static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
     const char* toolset = gg->GetPlatformToolset();
     if (toolset &&
         (toolset == kWINDOWS_7_1_SDK || /* clang-format please break here */

Source/cmVisualStudio10ToolsetOptions.cxx

@@ -11,7 +11,6 @@
 #include "cmVS10LibFlagTable.h"
 #include "cmVS10LinkFlagTable.h"
 #include "cmVS10MASMFlagTable.h"
-#include "cmVS10NASMFlagTable.h"
 #include "cmVS10RCFlagTable.h"
 #include "cmVS11CLFlagTable.h"
 #include "cmVS11CSharpFlagTable.h"