diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-12 13:31:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-12 13:31:32 (GMT) |
| commit | 58e56607c12789b41a722e03576c090584da4bf6 (patch) | |
| tree | d0b62b8a4b8c20a4fa60f2d2802a5e0258e70fab /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | 71a70c0e6c9aac54d61107fe9f1f1bf7c211821b (diff) | |
| parent | 861f1b3da65d3eda55e0e1f29d628aa3fb643f70 (diff) | |
| download | CMake-58e56607c12789b41a722e03576c090584da4bf6.zip CMake-58e56607c12789b41a722e03576c090584da4bf6.tar.gz CMake-58e56607c12789b41a722e03576c090584da4bf6.tar.bz2 | |
Merge topic 'vs-default-v100'
861f1b3d VS: Do not default to missing v100 64-bit toolset on VS 2010 Express
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 8bb43ee..ac9c8ef 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -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; } |