[Cmake-commits] CMake branch, next, updated. v3.6.1-1683-gfc66613

[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  fc6661363956d97e4f726623f0b551bc4292cac5 (commit)
       via  9998774f2280999c559cdffe7473085c841c2d39 (commit)
      from  24e158baed042535c40ec9d19edf7b5326269861 (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=fc6661363956d97e4f726623f0b551bc4292cac5
commit fc6661363956d97e4f726623f0b551bc4292cac5
Merge: 24e158b 9998774
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 14:53:16 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 1 14:53:16 2016 -0400

    Merge topic 'vs14-debug-enum-older-toolsets' into next
    
    9998774f VS: Fix VS 2015 .vcxproj debug setting for v80 toolset


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9998774f2280999c559cdffe7473085c841c2d39
commit 9998774f2280999c559cdffe7473085c841c2d39
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 14:43:59 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 1 14:50:04 2016 -0400

    VS: Fix VS 2015 .vcxproj debug setting for v80 toolset
    
    Closes: #16281

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 11dc28c..7e17818 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2357,7 +2357,9 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
       static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
     const char* toolset = gg->GetPlatformToolset();
     if (toolset &&
-        (toolset == kWINDOWS_7_1_SDK || cmHasLiteralPrefix(toolset, "v90") ||
+        (toolset == kWINDOWS_7_1_SDK || /* clang-format please break here */
+         cmHasLiteralPrefix(toolset, "v80") ||
+         cmHasLiteralPrefix(toolset, "v90") ||
          cmHasLiteralPrefix(toolset, "v100") ||
          cmHasLiteralPrefix(toolset, "v110") ||
          cmHasLiteralPrefix(toolset, "v120"))) {

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

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


hooks/post-receive
-- 
CMake