[Cmake-commits] CMake branch, next, updated. v3.6.2-2580-g2949343

[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  2949343dc340b4fba6a019bebc56a19117cf85a8 (commit)
       via  6250c24bf4834747d625a66a0a1b89e87d26eca2 (commit)
      from  9f26f85fc82352486088c5820345ac7928f08468 (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=2949343dc340b4fba6a019bebc56a19117cf85a8
commit 2949343dc340b4fba6a019bebc56a19117cf85a8
Merge: 9f26f85 6250c24
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 10:53:04 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 28 10:53:04 2016 -0400

    Merge topic 'vs-clang-llvm-support' into next
    
    6250c24b fixup! VS: Recognize VS/LLVM toolset names as Clang


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6250c24bf4834747d625a66a0a1b89e87d26eca2
commit 6250c24bf4834747d625a66a0a1b89e87d26eca2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 10:52:53 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 28 10:52:53 2016 -0400

    fixup! VS: Recognize VS/LLVM toolset names as Clang

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index b017eb1..7a9cd4b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1804,7 +1804,8 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   }
 
   if (this->MSTools) {
-    cmsys::RegularExpression clangToolset("(v[0-9]+_clang_.*|LLVM-vs[0-9]+.*)");
+    cmsys::RegularExpression clangToolset(
+      "(v[0-9]+_clang_.*|LLVM-vs[0-9]+.*)");
     const char* toolset = this->GlobalGenerator->GetPlatformToolset();
     if (toolset && clangToolset.find(toolset)) {
       this->WriteString("<ObjectFileName>"

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

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


hooks/post-receive
-- 
CMake