diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-27 11:44:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-27 11:45:15 (GMT) |
| commit | efb2a9f0938ea518177ad33d04186bdcfb87d7a9 (patch) | |
| tree | 763f51cfa48f6f5482b9f7e1f27009a2d3ec36ea /Modules | |
| parent | 311848f79035018c167f1319b4581ab0a1988732 (diff) | |
| parent | f3d7a1501003ab9582b94639b06d19feed107f2f (diff) | |
| download | CMake-efb2a9f0938ea518177ad33d04186bdcfb87d7a9.zip CMake-efb2a9f0938ea518177ad33d04186bdcfb87d7a9.tar.gz CMake-efb2a9f0938ea518177ad33d04186bdcfb87d7a9.tar.bz2 | |
Merge topic 'vs-clangcl' into release-3.17
f3d7a15010 VS: Fix ClangCL toolset compiler path detection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4523
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index a7b4950..d3ed45b 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -246,8 +246,10 @@ 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)?)?|[Cc][Ll][Aa][Nn][Gg][Cc][Ll])$") + 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 "^[Cc][Ll][Aa][Nn][Gg][Cc][Ll]$") + set(id_cl "$(CLToolExe)") elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*") set(id_cl clang.exe) else() |