kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Brad King 2016-09-12 09:31:32 -04:00 committed by CMake Topic Stage
parent 71a70c0e6c 861f1b3da6
commit 58e56607c1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -482,6 +482,10 @@ void cmGlobalVisualStudio10Generator::GenerateBuildCommand(
bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf) 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()) { if (this->GetPlatformToolset()) {
return true; return true;
} }