[Cmake-commits] CMake branch, master, updated. v3.6.1-559-gb06118f

[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, master has been updated
       via  b06118f8f1f2dd13ee055f35d18068ece9ff6615 (commit)
       via  4ada475ef5e15fa72a2f075ec1efafce321c313c (commit)
      from  9bc62024ac30d2adc69fd86c88c6d772769b79ac (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=b06118f8f1f2dd13ee055f35d18068ece9ff6615
commit b06118f8f1f2dd13ee055f35d18068ece9ff6615
Merge: 9bc6202 4ada475
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 5 08:50:20 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 5 08:50:20 2016 -0400

    Merge topic 'vs14-debug-enum-older-toolsets'
    
    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) {

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

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


hooks/post-receive
-- 
CMake