[Cmake-commits] CMake branch, next, updated. v3.6.2-2582-g15b19da

[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  15b19da7315b135a6b0026024eed8b7a17851229 (commit)
       via  3f300b84f312c340e92ff010c18dfebbeb4edff4 (commit)
      from  2949343dc340b4fba6a019bebc56a19117cf85a8 (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=15b19da7315b135a6b0026024eed8b7a17851229
commit 15b19da7315b135a6b0026024eed8b7a17851229
Merge: 2949343 3f300b8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 10:53:24 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 28 10:53:24 2016 -0400

    Merge topic 'vs-clang-llvm-support' into next
    
    3f300b84 VS: Recognize VS/LLVM toolset names as Clang


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f300b84f312c340e92ff010c18dfebbeb4edff4
commit 3f300b84f312c340e92ff010c18dfebbeb4edff4
Author:     Roman Wüger <roman.wueger at gmx.at>
AuthorDate: Wed Sep 28 08:46:00 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 28 10:53:10 2016 -0400

    VS: Recognize VS/LLVM toolset names as Clang
    
    Update the toolset name matching added by commit v3.6.0-rc1~279^2~10
    (VS: in Clang/C2 toolset, setup correct compiler settings, 2016-02-18)
    to match VS/LLVM toolset names too.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 723c69e..8b3b298 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -192,7 +192,7 @@ else()
   if(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM")
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")
   elseif(MSVC_VERSION GREATER 1310)
-    if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*")
+    if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "(v[0-9]+_clang_.*|LLVM-vs[0-9]+.*)")
       # Clang/C2 in MSVC14 Update 1 seems to not support -fsantinize (yet?)
       # set(_RTC1 "-fsantinize=memory,safe-stack")
       set(_FLAGS_CXX " -frtti -fexceptions")
@@ -291,7 +291,7 @@ macro(__windows_compiler_msvc lang)
 
   if("x${lang}" STREQUAL "xC" OR
       "x${lang}" STREQUAL "xCXX")
-    if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*")
+    if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "(v[0-9]+_clang_.*|LLVM-vs[0-9]+.*)")
       # note: MSVC 14 2015 Update 1 sets -fno-ms-compatibility by default, but this does not allow one to compile many projects
       # that include MS's own headers. CMake itself is affected project too.
       string(APPEND CMAKE_${lang}_FLAGS_INIT " ${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} -fms-extensions -fms-compatibility -D_WINDOWS -Wall${_FLAGS_${lang}}")
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 85084eb..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_.*");
+    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:


hooks/post-receive
-- 
CMake