diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-03 15:43:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-03 15:43:50 (GMT) |
| commit | cd285b749615c64e72ddadda0ba014c91829529c (patch) | |
| tree | 3c9f5a2128b845f84db6b465af104e6653e972d7 | |
| parent | 323c4fb989e0259c733f5a34044c693667a31842 (diff) | |
| parent | c846dbf89ee5b11a74dceb1c19fd7472eb8b075d (diff) | |
| download | CMake-cd285b749615c64e72ddadda0ba014c91829529c.zip CMake-cd285b749615c64e72ddadda0ba014c91829529c.tar.gz CMake-cd285b749615c64e72ddadda0ba014c91829529c.tar.bz2 | |
Merge topic 'DetermineCompilerId-versioned-llvm-for-vs'
c846dbf89e CMakeDetermineCompilerId: Support versioned LLVM for Visual Studio.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3281
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index c1c9982..746a806 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -189,7 +189,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} set(id_platform ${CMAKE_VS_PLATFORM_NAME}) set(id_lang "${lang}") set(id_PostBuildEvent_Command "") - if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "^[Ll][Ll][Vv][Mm]$") + if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "^[Ll][Ll][Vv][Mm](_v[0-9]+(_xp)?)?$") set(id_cl_var "ClangClExecutable") elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*") set(id_cl clang.exe) |