Merge topic 'vs-default-v100'
861f1b3d
VS: Do not default to missing v100 64-bit toolset on VS 2010 Express
This commit is contained in:
commit
58e56607c1
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue