diff options
| author | Konstantin Ivlev <tomskside@gmail.com> | 2017-09-04 08:12:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-11 13:58:22 (GMT) |
| commit | 8a4755ca57d5a0ef664b067f6ace737b417ef40d (patch) | |
| tree | 064632a4edbe51587f40dbf26fd9908edd7048b1 /Source | |
| parent | d4f58a9cd8e3709a0cb176814226da324b17e0fe (diff) | |
| download | CMake-8a4755ca57d5a0ef664b067f6ace737b417ef40d.zip CMake-8a4755ca57d5a0ef664b067f6ace737b417ef40d.tar.gz CMake-8a4755ca57d5a0ef664b067f6ace737b417ef40d.tar.bz2 | |
VS: Update support for LLVM-vs* toolsets from LLVM 5.0
Revert commit v3.7.0-rc1~25^2 (VS: Recognize VS/LLVM toolset names as
Clang, 2016-09-28). Since at least LLVM 5.0 the VS integration of the
LLVM toolchain now mimics cl and accepts MSVC-style command-line
arguments (unlike Microsoft Clang/C2).
Fixes: #17193, #17235
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 7fe2f2a..4a90d53 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>" |