diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-21 13:31:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-21 13:31:08 (GMT) |
| commit | 6cbaa8eb931950b8a834acc0c6f78a7290c4d3d9 (patch) | |
| tree | f774ac98c3d378e0e19c03ae0d6b29c235f63ea3 | |
| parent | 692bc2de9475d14a2f40b94d88ea91db2df5311c (diff) | |
| parent | 7b083d59c2bed8364bd9df52015aa4fcce99e17c (diff) | |
| download | CMake-6cbaa8eb931950b8a834acc0c6f78a7290c4d3d9.zip CMake-6cbaa8eb931950b8a834acc0c6f78a7290c4d3d9.tar.gz CMake-6cbaa8eb931950b8a834acc0c6f78a7290c4d3d9.tar.bz2 | |
Merge topic 'clang-cl-restore-preprocess'
7b083d59c2 clang-cl: Restore rules to create preprocessed and assembly output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5142
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 173ef40..de31dab 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -338,8 +338,8 @@ macro(__windows_compiler_msvc lang) # paths starting with /U as macro undefines, so we need to put a -- before the # input file path to force it to be treated as a path. string(REPLACE "-c <SOURCE>" "-c -- <SOURCE>" CMAKE_${lang}_COMPILE_OBJECT "${CMAKE_${lang}_COMPILE_OBJECT}") - string(REPLACE "-c <SOURCE>" "-c -- <SOURCE>" CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "${CMAKE_${lang}_COMPILE_OBJECT}") - string(REPLACE "-c <SOURCE>" "-c -- <SOURCE>" CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "${CMAKE_${lang}_COMPILE_OBJECT}") + string(REPLACE "-c <SOURCE>" "-c -- <SOURCE>" CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "${CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE}") + string(REPLACE "-c <SOURCE>" "-c -- <SOURCE>" CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "${CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE}") elseif(MSVC_VERSION GREATER_EQUAL 1913) # At least MSVC toolet 14.13 from VS 2017 15.6 |