mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-13 01:29:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

VS: Fix use of Windows7.1SDK 64-bit toolset with VS 2010 Express

Browse Source 
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.
This commit is contained in:
Brad King
2016-10-27 10:39:06 -04:00
parent 584ab5285b
commit 0caca40fcc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalVisualStudio10Generator.cxx
+5 -1
View File
@@ -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()