diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-19 14:53:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-08-19 14:53:48 (GMT) |
| commit | 7b083d59c2bed8364bd9df52015aa4fcce99e17c (patch) | |
| tree | 262ac34ec35514201a2f348096132adbd8de18d7 | |
| parent | 92d724903192b98e42cc1048ca587207aa20043f (diff) | |
| download | CMake-7b083d59c2bed8364bd9df52015aa4fcce99e17c.zip CMake-7b083d59c2bed8364bd9df52015aa4fcce99e17c.tar.gz CMake-7b083d59c2bed8364bd9df52015aa4fcce99e17c.tar.bz2 | |
clang-cl: Restore rules to create preprocessed and assembly output
In commit d993ebd4ca (clang-cl: Add '--' before source file, 2020-07-28)
we accidentally replaced these rules with those to compile an object
file.
| -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 |