mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-09 00:29:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

VS: Recognize VS/LLVM toolset names as Clang

Browse Source 
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.
This commit is contained in:
Roman Wüger
2016-09-28 08:46:00 +02:00
committed by Brad King
parent 1adcf4917e
commit 3f300b84f3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -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>"