diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-02 13:22:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-02 13:22:25 (GMT) |
| commit | 0ba0c67ba3af352c2e53da03136d1d032b4e41c4 (patch) | |
| tree | dd82ad831b88694026350343d438714027568020 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | cb3e091a45bfdb24115ef68fa36341cf93419681 (diff) | |
| parent | 9998774f2280999c559cdffe7473085c841c2d39 (diff) | |
| download | CMake-0ba0c67ba3af352c2e53da03136d1d032b4e41c4.zip CMake-0ba0c67ba3af352c2e53da03136d1d032b4e41c4.tar.gz CMake-0ba0c67ba3af352c2e53da03136d1d032b4e41c4.tar.bz2 | |
Merge topic 'vs14-debug-enum-older-toolsets'
9998774f VS: Fix VS 2015 .vcxproj debug setting for v80 toolset
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -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 907b65b..8ff7366 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2365,7 +2365,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"))) { |