[Cmake-commits] CMake branch, next, updated. v3.6.1-1115-ga67e5b8

[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  a67e5b8ce377c119914fa8e0983defbbd3daf146 (commit)
       via  4ada475ef5e15fa72a2f075ec1efafce321c313c (commit)
      from  144396b37723d63ddfbe3c6245adea884beb227a (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=a67e5b8ce377c119914fa8e0983defbbd3daf146
commit a67e5b8ce377c119914fa8e0983defbbd3daf146
Merge: 144396b 4ada475
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 4 11:41:28 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 4 11:41:28 2016 -0400

    Merge topic 'vs14-debug-enum-older-toolsets' into next
    
    4ada475e VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset

diff --cc Source/cmVisualStudio10TargetGenerator.cxx
index 7624f78,15fae42..b1885e5
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@@ -42,8 -42,10 +42,10 @@@
  #include "cmVisualStudioGeneratorOptions.h"
  #include "windows.h"
  
 -#include <cmsys/auto_ptr.hxx>
 +#include <cm_auto_ptr.hxx>
  
+ static std::string const kWINDOWS_7_1_SDK = "Windows7.1SDK";
+ 
  cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const
  {
    if (this->MSTools) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ada475ef5e15fa72a2f075ec1efafce321c313c
commit 4ada475ef5e15fa72a2f075ec1efafce321c313c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 4 11:40:09 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 4 11:40:09 2016 -0400

    VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset
    
    Closes: #16213

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index fb05976..15fae42 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -44,6 +44,8 @@
 
 #include <cmsys/auto_ptr.hxx>
 
+static std::string const kWINDOWS_7_1_SDK = "Windows7.1SDK";
+
 cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const
 {
   if (this->MSTools) {
@@ -2354,7 +2356,8 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
     cmGlobalVisualStudio10Generator* gg =
       static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
     const char* toolset = gg->GetPlatformToolset();
-    if (toolset && (cmHasLiteralPrefix(toolset, "v90") ||
+    if (toolset && (toolset == kWINDOWS_7_1_SDK ||
+                    cmHasLiteralPrefix(toolset, "v90") ||
                     cmHasLiteralPrefix(toolset, "v100") ||
                     cmHasLiteralPrefix(toolset, "v110") ||
                     cmHasLiteralPrefix(toolset, "v120"))) {

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

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


hooks/post-receive
-- 
CMake