diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-29 12:09:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-29 12:09:39 (GMT) |
| commit | b53a12c29cff61d8f97997a63a00e7ca59b566ba (patch) | |
| tree | d44a392e408298cd75951be0f7ae15c944485ee1 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 7cea3479d647ecf1957a4ed1f127a25197ac519e (diff) | |
| parent | 3f300b84f312c340e92ff010c18dfebbeb4edff4 (diff) | |
| download | CMake-b53a12c29cff61d8f97997a63a00e7ca59b566ba.zip CMake-b53a12c29cff61d8f97997a63a00e7ca59b566ba.tar.gz CMake-b53a12c29cff61d8f97997a63a00e7ca59b566ba.tar.bz2 | |
Merge topic 'vs-clang-llvm-support'
3f300b84 VS: Recognize VS/LLVM toolset names as Clang
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index b5fe754..d81f59d 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1795,7 +1795,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>" |