diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-04 15:40:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-05 19:21:23 (GMT) |
| commit | 926886a41c5d0784ec432703585b2b81aef165a6 (patch) | |
| tree | 2c324fd1caf0fc70e147cfa3846a52d7b8daf71f | |
| parent | 36fc3a53728e1a6774cdd6dee57fac063ff32b9c (diff) | |
| download | CMake-926886a41c5d0784ec432703585b2b81aef165a6.zip CMake-926886a41c5d0784ec432703585b2b81aef165a6.tar.gz CMake-926886a41c5d0784ec432703585b2b81aef165a6.tar.bz2 | |
VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset
Closes: #16213
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index fb05976..11dc28c 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -44,6 +44,8 @@ #include <cmsys/auto_ptr.hxx> +static std::string const kWINDOWS_7_1_SDK = "Windows7.1SDK"; + cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const { if (this->MSTools) { @@ -2354,10 +2356,11 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions( cmGlobalVisualStudio10Generator* gg = static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator); const char* toolset = gg->GetPlatformToolset(); - if (toolset && (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. |