diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-27 10:39:06 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-27 10:42:36 -0400 |
| commit | 0caca40fccead726db6c4d5f5b4ea990958914df (patch) | |
| tree | a21e81c05dadb759b4502b87d711c3e2e0ad60d4 /Source | |
| parent | 584ab5285b51945e0dd523caf77342985ac97ce4 (diff) | |
| download | cmake-0caca40fccead726db6c4d5f5b4ea990958914df.tar.gz | |
VS: Fix use of `Windows7.1SDK` 64-bit toolset with VS 2010 Express
Refactoring in commit 584ab528 (VS: Add internal API to get platform
toolset as string, 2016-10-18) accidentally changed the semantics of the
original `cmGlobalVisualStudio10Generator::GetPlatformToolset`
implementation to return a pointer to an empty string instead of
`nullptr` when no toolset is configured. This broke cases that tested
for `nullptr` to detect the lack of any specific toolset, such as the
call in `Find64BitTools`. Restore the `nullptr` return in this case.
Diffstat (limited to 'Source')
| -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 793c605268..5c010b4cef 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -339,7 +339,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() |