diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-07 16:10:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-07 16:10:28 (GMT) |
| commit | d42d3780ac1d62c7733affb9fd168a4e803634a2 (patch) | |
| tree | 563974bf50b06aabda1b9924682cb78194378bcf /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | a0d64ecf8b9eac29cbfeb7461cf3bcb1688f7aa7 (diff) | |
| parent | 27431de1627d95329712f4af8362fcaf2667aad5 (diff) | |
| download | CMake-d42d3780ac1d62c7733affb9fd168a4e803634a2.zip CMake-d42d3780ac1d62c7733affb9fd168a4e803634a2.tar.gz CMake-d42d3780ac1d62c7733affb9fd168a4e803634a2.tar.bz2 | |
Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into vs-fix-standalone-Windows7.1SDK-toolset-for-master
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
| -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; |