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

VS: Do not default to missing v100 64-bit toolset on VS 2010 Express

Browse Source 
Since commit 059c230d (VS: Explicitly default to v100 toolset in Visual
Studio 2010, 2016-07-21) the VS 2010 generator now correctly defaults to
the v100 toolset instead of no toolset.  However, this broke our logic
for defaulting to the `Windows7.1SDK` toolset for 64-bit builds on VS
2010 Express.  Fix the logic by ignoring the `v100` default in the case.
This commit is contained in:
Brad King 2016-09-09 10:17:23 -04:00
parent 059c230d89
commit 861f1b3da6
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

@ -461,6 +461,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;
} }