Commit f9fc8f83 authored by Brad King's avatar Brad King
Browse files

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

parents c8c58947 9998774f
......@@ -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"))) {
......
Markdown is supported
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