diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-14 13:23:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-14 13:23:45 (GMT) |
| commit | 4d3d28750edf75c44017d8297dcbda16c5d7b287 (patch) | |
| tree | f90f75b5cc9ff91424f593c59e2b0219d7fda4d4 | |
| parent | f5c19a9dcce10a0f2a57c2836a364d2226b9c6b0 (diff) | |
| parent | 36fc3a53728e1a6774cdd6dee57fac063ff32b9c (diff) | |
| download | CMake-4d3d28750edf75c44017d8297dcbda16c5d7b287.zip CMake-4d3d28750edf75c44017d8297dcbda16c5d7b287.tar.gz CMake-4d3d28750edf75c44017d8297dcbda16c5d7b287.tar.bz2 | |
Merge topic 'vs14-debug-enum-older-toolsets'
36fc3a53 VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986)
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 50da41b..f5bbf4d 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2359,7 +2359,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 = |