kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'vs14-debug-enum-older-toolsets'

Browse Source 
4ada475e VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset
This commit is contained in:
Brad King 2016-08-05 08:50:20 -04:00 committed by CMake Topic Stage
commit b06118f8f1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -44,6 +44,8 @@
#include <cm_auto_ptr.hxx> #include <cm_auto_ptr.hxx>
static std::string const kWINDOWS_7_1_SDK = "Windows7.1SDK";
cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const
{ {
if (this->MSTools) { if (this->MSTools) {
@ -2363,7 +2365,8 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
cmGlobalVisualStudio10Generator* gg = cmGlobalVisualStudio10Generator* gg =
static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator); static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
const char* toolset = gg->GetPlatformToolset(); const char* toolset = gg->GetPlatformToolset();
if (toolset && (cmHasLiteralPrefix(toolset, "v90") || if (toolset && (toolset == kWINDOWS_7_1_SDK ||
cmHasLiteralPrefix(toolset, "v90") ||
cmHasLiteralPrefix(toolset, "v100") || cmHasLiteralPrefix(toolset, "v100") ||
cmHasLiteralPrefix(toolset, "v110") || cmHasLiteralPrefix(toolset, "v110") ||
cmHasLiteralPrefix(toolset, "v120"))) { cmHasLiteralPrefix(toolset, "v120"))) {