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

This commit is contained in:
Brad King 2016-07-13 09:37:03 -04:00
commit 8ab1989e93
1 changed files with 2 additions and 1 deletions

View File

@ -2354,7 +2354,8 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
cmGlobalVisualStudio10Generator* gg =
static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
const char* toolset = gg->GetPlatformToolset();
if (toolset && (cmHasLiteralPrefix(toolset, "v100") ||
if (toolset && (cmHasLiteralPrefix(toolset, "v90") ||
cmHasLiteralPrefix(toolset, "v100") ||
cmHasLiteralPrefix(toolset, "v110") ||
cmHasLiteralPrefix(toolset, "v120"))) {
if (const char* debug =