diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-08 13:50:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-08 13:50:43 (GMT) |
| commit | ba9fcedf6a66e524416d8822fe8873e88fac5ab6 (patch) | |
| tree | fda571062545eff5e2c2883c069e0c341d85219c /Source | |
| parent | c46145c61b9e2bfb8c8ea893f95f31e2b480c0d3 (diff) | |
| parent | d42d3780ac1d62c7733affb9fd168a4e803634a2 (diff) | |
| download | CMake-ba9fcedf6a66e524416d8822fe8873e88fac5ab6.zip CMake-ba9fcedf6a66e524416d8822fe8873e88fac5ab6.tar.gz CMake-ba9fcedf6a66e524416d8822fe8873e88fac5ab6.tar.bz2 | |
Merge topic 'vs-fix-standalone-Windows7.1SDK-toolset-for-master'
d42d3780 Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into vs-fix-standalone-Windows7.1SDK-toolset-for-master
27431de1 VS: Fix standalone Windows7.1SDK toolset selection
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index d992aef..dde6e82 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -98,7 +98,16 @@ cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator( this->SystemIsWindowsPhone = false; this->SystemIsWindowsStore = false; this->MSBuildCommandInitialized = false; - this->DefaultPlatformToolset = "v100"; + { + std::string envPlatformToolset; + if (cmSystemTools::GetEnv("PlatformToolset", envPlatformToolset) && + envPlatformToolset == "Windows7.1SDK") { + // We are running from a Windows7.1SDK command prompt. + this->DefaultPlatformToolset = "Windows7.1SDK"; + } else { + this->DefaultPlatformToolset = "v100"; + } + } this->DefaultClFlagTable = cmVS10CLFlagTable; this->DefaultCSharpFlagTable = cmVS10CSharpFlagTable; this->DefaultLibFlagTable = cmVS10LibFlagTable; |