diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-08 14:02:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-08 14:02:03 (GMT) |
| commit | 702a5489929afd1e16adf5a2123b906e4f398e2b (patch) | |
| tree | b3b6d0bf05e653e2f10aae1827b292879a0ad9ff | |
| parent | 5a62e0c1721281503c8b4cd9d4d3d0de8abebf0f (diff) | |
| parent | 038e3a4f718bcf6936065beecf886f7c1fc178cc (diff) | |
| download | CMake-702a5489929afd1e16adf5a2123b906e4f398e2b.zip CMake-702a5489929afd1e16adf5a2123b906e4f398e2b.tar.gz CMake-702a5489929afd1e16adf5a2123b906e4f398e2b.tar.bz2 | |
Merge topic 'vs14-debug-enum-older-toolsets'
038e3a4f cmVisualStudio10TargetGenerator: Run clang-format
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index b1885e5..c33a291 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2365,11 +2365,11 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions( cmGlobalVisualStudio10Generator* gg = static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator); const char* toolset = gg->GetPlatformToolset(); - if (toolset && (toolset == kWINDOWS_7_1_SDK || - cmHasLiteralPrefix(toolset, "v90") || - cmHasLiteralPrefix(toolset, "v100") || - cmHasLiteralPrefix(toolset, "v110") || - cmHasLiteralPrefix(toolset, "v120"))) { + if (toolset && + (toolset == kWINDOWS_7_1_SDK || cmHasLiteralPrefix(toolset, "v90") || + cmHasLiteralPrefix(toolset, "v100") || + cmHasLiteralPrefix(toolset, "v110") || + cmHasLiteralPrefix(toolset, "v120"))) { if (const char* debug = linkOptions.GetFlag("GenerateDebugInformation")) { // Convert value from enumeration back to boolean for older toolsets. |