diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-05 12:50:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-05 12:50:20 (GMT) |
| commit | b06118f8f1f2dd13ee055f35d18068ece9ff6615 (patch) | |
| tree | 200b0b0be9b0f8894e6c6ab7112c29b607dae007 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 9bc62024ac30d2adc69fd86c88c6d772769b79ac (diff) | |
| parent | 4ada475ef5e15fa72a2f075ec1efafce321c313c (diff) | |
| download | CMake-b06118f8f1f2dd13ee055f35d18068ece9ff6615.zip CMake-b06118f8f1f2dd13ee055f35d18068ece9ff6615.tar.gz CMake-b06118f8f1f2dd13ee055f35d18068ece9ff6615.tar.bz2 | |
Merge topic 'vs14-debug-enum-older-toolsets'
4ada475e VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 7624f78..b1885e5 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -44,6 +44,8 @@ #include <cm_auto_ptr.hxx> +static std::string const kWINDOWS_7_1_SDK = "Windows7.1SDK"; + cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const { if (this->MSTools) { @@ -2363,7 +2365,8 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions( cmGlobalVisualStudio10Generator* gg = static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator); const char* toolset = gg->GetPlatformToolset(); - if (toolset && (cmHasLiteralPrefix(toolset, "v90") || + if (toolset && (toolset == kWINDOWS_7_1_SDK || + cmHasLiteralPrefix(toolset, "v90") || cmHasLiteralPrefix(toolset, "v100") || cmHasLiteralPrefix(toolset, "v110") || cmHasLiteralPrefix(toolset, "v120"))) { |