diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-06 13:37:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-06 13:37:37 (GMT) |
| commit | 4ec0572736fcaf53e74ef706605428630660ec02 (patch) | |
| tree | 572cc75f778a78353601979452bc24e76bc5d09c /Modules | |
| parent | b736a22181038c60578daf4879142fa3fc6e85f8 (diff) | |
| parent | 3c125c6de028aeed39b9f9629618f7b9842eccd5 (diff) | |
| download | CMake-4ec0572736fcaf53e74ef706605428630660ec02.zip CMake-4ec0572736fcaf53e74ef706605428630660ec02.tar.gz CMake-4ec0572736fcaf53e74ef706605428630660ec02.tar.bz2 | |
Merge topic 'vs-clangcl-toolset'
3c125c6de0 VS: Support Visual Studio Clang Toolkit identification
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4111
Diffstat (limited to 'Modules')
| -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 0b3664c..002fe21 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -246,7 +246,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](_v[0-9]+(_xp)?)?$") + if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "^([Ll][Ll][Vv][Mm](_v[0-9]+(_xp)?)?|[Cc][Ll][Aa][Nn][Gg][Cc][Ll])$") set(id_cl_var "ClangClExecutable") elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*") set(id_cl clang.exe) |