diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-01 14:53:27 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-01 14:53:27 -0400 |
| commit | f9fc8f83d0784d2f9b73bb0a476675b2f34c8fbe (patch) | |
| tree | 049a5ee89a5b8d021ccf2f55d5194191a1e427d9 | |
| parent | c8c58947f289d7a51198cf73d171573be3805b8f (diff) | |
| parent | 9998774f2280999c559cdffe7473085c841c2d39 (diff) | |
| download | cmake-f9fc8f83d0784d2f9b73bb0a476675b2f34c8fbe.tar.gz | |
Merge branch 'vs14-debug-enum-older-toolsets' into release
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index e31a192d47..19993970ab 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2356,7 +2356,9 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions( static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator); const char* toolset = gg->GetPlatformToolset(); if (toolset && - (toolset == kWINDOWS_7_1_SDK || cmHasLiteralPrefix(toolset, "v90") || + (toolset == kWINDOWS_7_1_SDK || /* clang-format please break here */ + cmHasLiteralPrefix(toolset, "v80") || + cmHasLiteralPrefix(toolset, "v90") || cmHasLiteralPrefix(toolset, "v100") || cmHasLiteralPrefix(toolset, "v110") || cmHasLiteralPrefix(toolset, "v120"))) { |