diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-04 13:19:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-04 13:19:30 (GMT) |
| commit | b0317d9b98f35402ad18fbdb47b1f6c0ed14cc97 (patch) | |
| tree | e427fa8cfd0033aae0a1c63f0d1c7e6851f83cd0 | |
| parent | 27a29c46b6d4435dbc0015f74232f6f30e0459da (diff) | |
| parent | ee70c5de4de6eca97be2ced2534e0e34bae6f30c (diff) | |
| download | CMake-b0317d9b98f35402ad18fbdb47b1f6c0ed14cc97.zip CMake-b0317d9b98f35402ad18fbdb47b1f6c0ed14cc97.tar.gz CMake-b0317d9b98f35402ad18fbdb47b1f6c0ed14cc97.tar.bz2 | |
Merge topic 'llvm-rc-defines-not-flags' into release-3.17
ee70c5de4d llvm-rc: Forward DEFINES instead of FLAGS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4419
| -rw-r--r-- | Modules/Platform/Windows-Clang.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-Clang.cmake b/Modules/Platform/Windows-Clang.cmake index dc8dd6f..87ddfcd 100644 --- a/Modules/Platform/Windows-Clang.cmake +++ b/Modules/Platform/Windows-Clang.cmake @@ -141,7 +141,7 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" set(CMAKE_RC_PREPROCESSOR CMAKE_CXX_COMPILER) endif() if(DEFINED CMAKE_RC_PREPROCESSOR) - set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_COMMAND} -E cmake_llvm_rc <OBJECT>.pp <${CMAKE_RC_PREPROCESSOR}> <DEFINES> -DRC_INVOKED <INCLUDES> <FLAGS> -clang:-MD -clang:-MF -clang:<SOURCE>.d -E <SOURCE> -- <CMAKE_RC_COMPILER> <FLAGS> /fo <OBJECT> <OBJECT>.pp") + set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_COMMAND} -E cmake_llvm_rc <OBJECT>.pp <${CMAKE_RC_PREPROCESSOR}> <DEFINES> -DRC_INVOKED <INCLUDES> <FLAGS> -clang:-MD -clang:-MF -clang:<SOURCE>.d -E <SOURCE> -- <CMAKE_RC_COMPILER> <DEFINES> /fo <OBJECT> <OBJECT>.pp") if(CMAKE_GENERATOR STREQUAL "Ninja") set(CMAKE_NINJA_CMCLDEPS_RC 0) set(CMAKE_NINJA_DEP_TYPE_RC gcc) |