diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-13 13:37:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-07-13 13:37:03 (GMT) |
| commit | 8ab1989e934a1edca2ca5adf3453603838ef5ead (patch) | |
| tree | aaa52ae0831ff49a8e99c6cd914fbdedde321fe8 | |
| parent | 9c9ac043b43caf116ab2ebd2d9b4c711cdb716ca (diff) | |
| parent | 36fc3a53728e1a6774cdd6dee57fac063ff32b9c (diff) | |
| download | CMake-8ab1989e934a1edca2ca5adf3453603838ef5ead.zip CMake-8ab1989e934a1edca2ca5adf3453603838ef5ead.tar.gz CMake-8ab1989e934a1edca2ca5adf3453603838ef5ead.tar.bz2 | |
Merge branch 'vs14-debug-enum-older-toolsets' into release
| -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 3b1cddb..fb05976 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -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 = |