diff options
author | Brad King <brad.king@kitware.com> | 2020-08-19 15:37:05 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-19 15:37:54 (GMT) |
commit | 833e84ca1ca09ee00c3cf1b0b7c4e7e5a419fa61 (patch) | |
tree | 571bbdf5ed6db5dc318313e7329b95194bcd4cf2 /Modules | |
parent | e9d0059bb3db439c7b1f26ddfcaf140ac70fbeb6 (diff) | |
parent | 3937536d16a5f9a59784a43e151c2632f8c6003e (diff) | |
download | CMake-833e84ca1ca09ee00c3cf1b0b7c4e7e5a419fa61.zip CMake-833e84ca1ca09ee00c3cf1b0b7c4e7e5a419fa61.tar.gz CMake-833e84ca1ca09ee00c3cf1b0b7c4e7e5a419fa61.tar.bz2 |
Merge topic 'llvm-rc-quote-cmake' into release-3.18
3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5139
Diffstat (limited to 'Modules')
-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 dff8166..995c635 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 <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") + 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) |