diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-12 13:38:28 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-12 09:39:40 -0400 |
| commit | 3ea87bce69d1b6120b227fed3838f1bc9ab45db1 (patch) | |
| tree | c16f66d5d33d5433d96627edb59bd3b000fe95bf /Source | |
| parent | cb171502287db0e4911faa10d748c72f08e5a9dd (diff) | |
| parent | 8a4755ca57d5a0ef664b067f6ace737b417ef40d (diff) | |
| download | cmake-3ea87bce69d1b6120b227fed3838f1bc9ab45db1.tar.gz | |
Merge topic 'vs-clang-llvm-support'
8a4755ca VS: Update support for LLVM-vs* toolsets from LLVM 5.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1231
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index bd3e82df64..36328ba9a2 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2471,8 +2471,7 @@ void cmVisualStudio10TargetGenerator::WriteClOptions( } if (this->MSTools) { - cmsys::RegularExpression clangToolset( - "(v[0-9]+_clang_.*|LLVM-vs[0-9]+.*)"); + cmsys::RegularExpression clangToolset("v[0-9]+_clang_.*"); const char* toolset = this->GlobalGenerator->GetPlatformToolset(); if (toolset && clangToolset.find(toolset)) { this->WriteString("<ObjectFileName>" |