From 926886a41c5d0784ec432703585b2b81aef165a6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 4 Aug 2016 11:40:09 -0400 Subject: [PATCH] VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset Closes: #16213 --- Source/cmVisualStudio10TargetGenerator.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index fb05976c9..11dc28cc8 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -44,6 +44,8 @@ #include +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(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.