Merge topic 'vs14-debug-enum-older-toolsets'

3f15665a VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)
This commit is contained in:
Brad King 2016-03-08 08:39:32 -05:00 committed by CMake Topic Stage
commit 79e05af4a3
1 changed files with 2 additions and 1 deletions

View File

@ -2715,7 +2715,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
const char* toolset = gg->GetPlatformToolset();
if (toolset &&
(cmHasLiteralPrefix(toolset, "v110") ||
(cmHasLiteralPrefix(toolset, "v100") ||
cmHasLiteralPrefix(toolset, "v110") ||
cmHasLiteralPrefix(toolset, "v120")))
{
if (const char* debug = linkOptions.GetFlag("GenerateDebugInformation"))