Commit 47281310 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

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's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !910
parents ff56a2f7 ed77c5c5
...@@ -790,8 +790,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget( ...@@ -790,8 +790,6 @@ void cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
bool usePRE_BUILD = false; bool usePRE_BUILD = false;
cmGlobalGenerator* gg = lg->GetGlobalGenerator(); cmGlobalGenerator* gg = lg->GetGlobalGenerator();
if (gg->GetName().find("Visual Studio") != std::string::npos) { 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 // Under VS use a PRE_BUILD event instead of a separate target to
// reduce the number of targets loaded into the IDE. // reduce the number of targets loaded into the IDE.
// This also works around a VS 11 bug that may skip updating the target: // This also works around a VS 11 bug that may skip updating the target:
......
...@@ -3154,8 +3154,6 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions( ...@@ -3154,8 +3154,6 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
// FIXME: Select flag table based on toolset instead of VS version. // FIXME: Select flag table based on toolset instead of VS version.
if (this->LocalGenerator->GetVersion() >= if (this->LocalGenerator->GetVersion() >=
cmGlobalVisualStudioGenerator::VS14) { cmGlobalVisualStudioGenerator::VS14) {
cmGlobalVisualStudio10Generator* gg =
static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
const char* toolset = gg->GetPlatformToolset(); const char* toolset = gg->GetPlatformToolset();
if (toolset && if (toolset &&
(toolset == kWINDOWS_7_1_SDK || /* clang-format please break here */ (toolset == kWINDOWS_7_1_SDK || /* clang-format please break here */
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "cmVS10LibFlagTable.h" #include "cmVS10LibFlagTable.h"
#include "cmVS10LinkFlagTable.h" #include "cmVS10LinkFlagTable.h"
#include "cmVS10MASMFlagTable.h" #include "cmVS10MASMFlagTable.h"
#include "cmVS10NASMFlagTable.h"
#include "cmVS10RCFlagTable.h" #include "cmVS10RCFlagTable.h"
#include "cmVS11CLFlagTable.h" #include "cmVS11CLFlagTable.h"
#include "cmVS11CSharpFlagTable.h" #include "cmVS11CSharpFlagTable.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment