diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-27 15:17:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-27 15:17:01 (GMT) |
| commit | fe03a86eb392b5c9a0f551e40b625cefa972e04b (patch) | |
| tree | bdbdca39b587416123d24032d7285fb591c02f77 | |
| parent | 5448f0068cc4e228a7481905412fc956e239a827 (diff) | |
| parent | 0caca40fccead726db6c4d5f5b4ea990958914df (diff) | |
| download | CMake-fe03a86eb392b5c9a0f551e40b625cefa972e04b.zip CMake-fe03a86eb392b5c9a0f551e40b625cefa972e04b.tar.gz CMake-fe03a86eb392b5c9a0f551e40b625cefa972e04b.tar.bz2 | |
Merge topic 'vs-fix-no-toolset'
0caca40f VS: Fix use of `Windows7.1SDK` 64-bit toolset with VS 2010 Express
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 7d91740..2ce65cd 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -349,7 +349,11 @@ void cmGlobalVisualStudio10Generator::EnableLanguage( const char* cmGlobalVisualStudio10Generator::GetPlatformToolset() const { - return this->GetPlatformToolsetString().c_str(); + std::string const& toolset = this->GetPlatformToolsetString(); + if (toolset.empty()) { + return CM_NULLPTR; + } + return toolset.c_str(); } std::string const& cmGlobalVisualStudio10Generator::GetPlatformToolsetString() |