diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-27 12:55:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-27 12:55:28 (GMT) |
| commit | 5833739c4a64e45d902eabd0a072216e5768428e (patch) | |
| tree | 2fba6094d2d7375e423a730a7e9718d43389574e /Modules | |
| parent | 4570b5ae91677e62a6dc6c55e13a33925a894c83 (diff) | |
| parent | 8375c303e272fd7d20383a86d0c99433b7e0da67 (diff) | |
| download | CMake-5833739c4a64e45d902eabd0a072216e5768428e.zip CMake-5833739c4a64e45d902eabd0a072216e5768428e.tar.gz CMake-5833739c4a64e45d902eabd0a072216e5768428e.tar.bz2 | |
Merge branch 'vs-llvm-extension' into release-3.14
Merge-request: !3024
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 8ba4246..59dab6d 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -181,7 +181,10 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} set(vs_version ${CMAKE_MATCH_1}) set(id_platform ${CMAKE_VS_PLATFORM_NAME}) set(id_lang "${lang}") - if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*") + set(id_PostBuildEvent_Command "") + if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "^[Ll][Ll][Vv][Mm]$") + set(id_cl_var "ClangClExecutable") + elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*") set(id_cl clang.exe) else() set(id_cl cl.exe) @@ -268,7 +271,11 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} set(id_dir ${CMAKE_${lang}_COMPILER_ID_DIR}) set(id_src "${src}") set(id_compile "ClCompile") - set(id_PostBuildEvent_Command "for %%i in (${id_cl}) do %40echo CMAKE_${lang}_COMPILER=%%~$PATH:i") + if(id_cl_var) + set(id_PostBuildEvent_Command "echo CMAKE_${lang}_COMPILER=$(${id_cl_var})") + else() + set(id_PostBuildEvent_Command "for %%i in (${id_cl}) do %40echo CMAKE_${lang}_COMPILER=%%~$PATH:i") + endif() set(id_Import_props "") set(id_Import_targets "") set(id_ItemDefinitionGroup_entry "") |