diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-07 12:00:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-07 12:00:44 (GMT) |
| commit | 3d61ff7b1028b00119d4b1388e9fe0fca34499ff (patch) | |
| tree | 0527a793a1d0fcec0126b240a16431bb46fb35c6 /Modules/Platform/Windows-Clang.cmake | |
| parent | 3db04c193cb5f9249a0f84d832da5327c4560190 (diff) | |
| parent | 35a29ec82790890df4872e60943e9127e4603e54 (diff) | |
| download | CMake-3d61ff7b1028b00119d4b1388e9fe0fca34499ff.zip CMake-3d61ff7b1028b00119d4b1388e9fe0fca34499ff.tar.gz CMake-3d61ff7b1028b00119d4b1388e9fe0fca34499ff.tar.bz2 | |
Merge topic 'llvm-rc-include-path' into release-3.17
35a29ec827 llvm-rc: Restore include path for data after explicit preprocessing
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4570
Diffstat (limited to 'Modules/Platform/Windows-Clang.cmake')
| -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 96c0791..a048698 100644 --- a/Modules/Platform/Windows-Clang.cmake +++ b/Modules/Platform/Windows-Clang.cmake @@ -142,7 +142,7 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" endif() if(DEFINED CMAKE_RC_PREPROCESSOR) set(CMAKE_DEPFILE_FLAGS_RC "-clang:-MD -clang:-MF -clang:<DEPFILE>") - set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_COMMAND} -E cmake_llvm_rc <OBJECT>.pp <${CMAKE_RC_PREPROCESSOR}> <DEFINES> -DRC_INVOKED <INCLUDES> <FLAGS> -E <SOURCE> -- <CMAKE_RC_COMPILER> <DEFINES> /fo <OBJECT> <OBJECT>.pp") + set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_COMMAND} -E cmake_llvm_rc <SOURCE> <OBJECT>.pp <${CMAKE_RC_PREPROCESSOR}> <DEFINES> -DRC_INVOKED <INCLUDES> <FLAGS> -E <SOURCE> -- <CMAKE_RC_COMPILER> <DEFINES> -I <SOURCE_DIR> <INCLUDES> /fo <OBJECT> <OBJECT>.pp") if(CMAKE_GENERATOR STREQUAL "Ninja") set(CMAKE_NINJA_CMCLDEPS_RC 0) set(CMAKE_NINJA_DEP_TYPE_RC gcc) |