Commit 58e56607 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'vs-default-v100'

861f1b3d VS: Do not default to missing v100 64-bit toolset on VS 2010 Express
parents 71a70c0e 861f1b3d
......@@ -482,6 +482,10 @@ void cmGlobalVisualStudio10Generator::GenerateBuildCommand(
bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf)
{
if (this->DefaultPlatformToolset == "v100") {
// The v100 64-bit toolset does not exist in the express edition.
this->DefaultPlatformToolset.clear();
}
if (this->GetPlatformToolset()) {
return true;
}
......
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