summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-03-08 13:39:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-03-08 13:39:32 (GMT)
commit79e05af4a301e2ac7b09c63fd7abca72f4d4da7d (patch)
treea186ada064b649f87da54f9b25bc6b1e1956cde2 /Source/cmVisualStudio10TargetGenerator.cxx
parent1d1b72a20dd16689634c2963217171b5593a5d2c (diff)
parent3f15665a4554efde8d80d6fac689dca187f520bc (diff)
downloadCMake-79e05af4a301e2ac7b09c63fd7abca72f4d4da7d.zip
CMake-79e05af4a301e2ac7b09c63fd7abca72f4d4da7d.tar.gz
CMake-79e05af4a301e2ac7b09c63fd7abca72f4d4da7d.tar.bz2
Merge topic 'vs14-debug-enum-older-toolsets'
3f15665a VS: Fix VS 2015 .vcxproj debug setting for v100 toolset (#15986)
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 61d7855..27a01a3 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -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"))