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 | b5198dacdd43aa77f7a2db4bb5bacca44d6f0da2 (patch) | |
| tree | 91ebe59ce4c5c312fb2acbbdb438def37700ae41 | |
| parent | b55965e137d5251bc340b50c8acfb802353b663e (diff) | |
| parent | 447dfddb20f51c191d2e130f9737d011dafba6cd (diff) | |
| download | CMake-b5198dacdd43aa77f7a2db4bb5bacca44d6f0da2.zip CMake-b5198dacdd43aa77f7a2db4bb5bacca44d6f0da2.tar.gz CMake-b5198dacdd43aa77f7a2db4bb5bacca44d6f0da2.tar.bz2 | |
Merge topic 'llvm-rc-quote-cmake'
447dfddb20 Merge branch 'backport-3.18-llvm-rc-quote-cmake' into llvm-rc-quote-cmake
3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5139
| -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 05dff9d..7a75004 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) |