diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-07 16:17:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-07 16:17:49 (GMT) |
| commit | f243a34cce8e4591e913566d86c1a28dc3df7996 (patch) | |
| tree | 609e0e4a13535a9530a60c20411b60614997d5e8 /Source | |
| parent | 0d89c1e87cac3ae02bd2c9864588accbd406e919 (diff) | |
| parent | 27431de1627d95329712f4af8362fcaf2667aad5 (diff) | |
| download | CMake-f243a34cce8e4591e913566d86c1a28dc3df7996.zip CMake-f243a34cce8e4591e913566d86c1a28dc3df7996.tar.gz CMake-f243a34cce8e4591e913566d86c1a28dc3df7996.tar.bz2 | |
Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into release
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 caaac87..502c93a 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -93,7 +93,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->Version = VS10; } |