[Cmake-commits] CMake branch, next, updated. v3.7.0-rc2-777-ga69d7a4

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a69d7a4ee0eff002f0ab4a4b19164a33b7157333 (commit)
       via  0caca40fccead726db6c4d5f5b4ea990958914df (commit)
      from  246b82be53e8e68e92c06ddfe261cde92b1d04fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a69d7a4ee0eff002f0ab4a4b19164a33b7157333
commit a69d7a4ee0eff002f0ab4a4b19164a33b7157333
Merge: 246b82b 0caca40
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 27 11:08:48 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 27 11:08:48 2016 -0400

    Merge topic 'vs-fix-no-toolset' into next
    
    0caca40f VS: Fix use of `Windows7.1SDK` 64-bit toolset with VS 2010 Express


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0caca40fccead726db6c4d5f5b4ea990958914df
commit 0caca40fccead726db6c4d5f5b4ea990958914df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 27 10:39:06 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 27 10:42:36 2016 -0400

    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.

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 793c605..5c010b4 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()

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake