diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-31 12:54:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-31 12:54:51 (GMT) |
| commit | 47281310bf610f3ab975d00831e9f3fe713ddde1 (patch) | |
| tree | de3b138e112e65a468e78583198090a29e2b200d | |
| parent | ff56a2f7201d71c741717ee4651075d0accfd9fe (diff) | |
| parent | ed77c5c5bd8c3ac9ca172db39019ec71cd243a8a (diff) | |
| download | CMake-47281310bf610f3ab975d00831e9f3fe713ddde1.zip CMake-47281310bf610f3ab975d00831e9f3fe713ddde1.tar.gz CMake-47281310bf610f3ab975d00831e9f3fe713ddde1.tar.bz2 | |
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 <kwrobot@kitware.com>
Merge-request: !910
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 2 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmVisualStudio10ToolsetOptions.cxx | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index e82665b..a39c10b 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/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: diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index e174f13..46c2894 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/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 */ diff --git a/Source/cmVisualStudio10ToolsetOptions.cxx b/Source/cmVisualStudio10ToolsetOptions.cxx index 0f15ec4..afca216 100644 --- a/Source/cmVisualStudio10ToolsetOptions.cxx +++ b/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" |