Commit d42d3780 authored by Brad King's avatar Brad King

Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into...

Merge branch 'vs-fix-standalone-Windows7.1SDK-toolset' into vs-fix-standalone-Windows7.1SDK-toolset-for-master
parents a0d64ecf 27431de1
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment