[Cmake-commits] CMake branch, next, updated. v3.5.0-411-g730be0e

[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  730be0e891795f3cbbc6e506a52b7bb612eb1fbb (commit)
       via  6c35ae879aacfa1158698dbc3fac00f79377a256 (commit)
      from  49cff25ca3e667d6d5a20a6b64ed55ef875890c1 (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=730be0e891795f3cbbc6e506a52b7bb612eb1fbb
commit 730be0e891795f3cbbc6e506a52b7bb612eb1fbb
Merge: 49cff25 6c35ae8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 9 14:49:12 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 9 14:49:12 2016 -0500

    Merge topic 'vs-clang-cl' into next
    
    6c35ae87 fixup! VS: in Clang/C2 toolset, setup correct compiler settings


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c35ae879aacfa1158698dbc3fac00f79377a256
commit 6c35ae879aacfa1158698dbc3fac00f79377a256
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 9 14:47:35 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 9 14:47:35 2016 -0500

    fixup! VS: in Clang/C2 toolset, setup correct compiler settings

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 3b79087..31873b5 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2079,7 +2079,8 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
   if(this->MSTools)
     {
     cmsys::RegularExpression clangToolset("v[0-9]+_clang_.*");
-    if (clangToolset.find(this->GlobalGenerator->GetPlatformToolset()))
+    const char* toolset = this->GlobalGenerator->GetPlatformToolset();
+    if (toolset && clangToolset.find(toolset))
       {
       this->WriteString("<ObjectFileName>"
                         "$(IntDir)%(filename).obj"

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

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


hooks/post-receive
-- 
CMake