mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-24 15:18:26 -05:00
Merge topic 'minor-cleanups'
ed77c5c5cmQtAutoGeneratorInitializer: Remove unused local variableb398e716cmVisualStudio10TargetGenerator: Remove shadowing local variableda2330bdcmVisualStudio10ToolsetOptions: Remove unused include Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !910
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user