Merge branch 'vs14-debug-enum-older-toolsets' into release

This commit is contained in:
Brad King 2016-09-01 14:53:27 -04:00
commit f9fc8f83d0
1 changed files with 3 additions and 1 deletions

View File

@ -2356,7 +2356,9 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
const char* toolset = gg->GetPlatformToolset();
if (toolset &&
(toolset == kWINDOWS_7_1_SDK || cmHasLiteralPrefix(toolset, "v90") ||
(toolset == kWINDOWS_7_1_SDK || /* clang-format please break here */
cmHasLiteralPrefix(toolset, "v80") ||
cmHasLiteralPrefix(toolset, "v90") ||
cmHasLiteralPrefix(toolset, "v100") ||
cmHasLiteralPrefix(toolset, "v110") ||
cmHasLiteralPrefix(toolset, "v120"))) {