[Cmake-commits] CMake branch, next, updated. v3.6.1-1130-g435e2ab

[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  435e2ab79c7f293254eab39a5a4150883e9066ca (commit)
       via  038e3a4f718bcf6936065beecf886f7c1fc178cc (commit)
      from  05c29d64b440766b28622db87d5ab91069ec2af7 (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=435e2ab79c7f293254eab39a5a4150883e9066ca
commit 435e2ab79c7f293254eab39a5a4150883e9066ca
Merge: 05c29d6 038e3a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 5 15:21:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 5 15:21:00 2016 -0400

    Merge topic 'vs14-debug-enum-older-toolsets' into next
    
    038e3a4f cmVisualStudio10TargetGenerator: Run clang-format


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=038e3a4f718bcf6936065beecf886f7c1fc178cc
commit 038e3a4f718bcf6936065beecf886f7c1fc178cc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 5 15:20:20 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 5 15:20:20 2016 -0400

    cmVisualStudio10TargetGenerator: Run clang-format

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 15fae42..11dc28c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2356,11 +2356,11 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
     cmGlobalVisualStudio10Generator* gg =
       static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
     const char* toolset = gg->GetPlatformToolset();
-    if (toolset && (toolset == kWINDOWS_7_1_SDK ||
-                    cmHasLiteralPrefix(toolset, "v90") ||
-                    cmHasLiteralPrefix(toolset, "v100") ||
-                    cmHasLiteralPrefix(toolset, "v110") ||
-                    cmHasLiteralPrefix(toolset, "v120"))) {
+    if (toolset &&
+        (toolset == kWINDOWS_7_1_SDK || cmHasLiteralPrefix(toolset, "v90") ||
+         cmHasLiteralPrefix(toolset, "v100") ||
+         cmHasLiteralPrefix(toolset, "v110") ||
+         cmHasLiteralPrefix(toolset, "v120"))) {
       if (const char* debug =
             linkOptions.GetFlag("GenerateDebugInformation")) {
         // Convert value from enumeration back to boolean for older toolsets.

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

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


hooks/post-receive
-- 
CMake