diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-09 14:17:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-09 14:17:23 (GMT) |
| commit | 861f1b3da65d3eda55e0e1f29d628aa3fb643f70 (patch) | |
| tree | ce1a1523d458f53e770902f8807b0d60d69cfcfc /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | 059c230d89b2f5c82423fc6458302620f4b09599 (diff) | |
| download | CMake-861f1b3da65d3eda55e0e1f29d628aa3fb643f70.zip CMake-861f1b3da65d3eda55e0e1f29d628aa3fb643f70.tar.gz CMake-861f1b3da65d3eda55e0e1f29d628aa3fb643f70.tar.bz2 | |
VS: Do not default to missing v100 64-bit toolset on VS 2010 Express
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.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index df831e5..4d8eb6f 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -461,6 +461,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; } |