diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-05 19:21:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-05 19:21:48 (GMT) |
| commit | 054275c6d6caceb1b8c0d221aab65bc8f74e2c4e (patch) | |
| tree | 82b009c3e1216b61a5b32ba0f2b29954f6ba7c35 | |
| parent | 5bcbc3857fd9976389d8eee3bb54e352ea950aec (diff) | |
| parent | 926886a41c5d0784ec432703585b2b81aef165a6 (diff) | |
| download | CMake-054275c6d6caceb1b8c0d221aab65bc8f74e2c4e.zip CMake-054275c6d6caceb1b8c0d221aab65bc8f74e2c4e.tar.gz CMake-054275c6d6caceb1b8c0d221aab65bc8f74e2c4e.tar.bz2 | |
Merge branch 'vs14-debug-enum-older-toolsets' into release
| -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. |