Commit 7a92fb7b authored by Kyle Edwards's avatar Kyle Edwards Committed by Kitware Robot

Merge topic 'clang-llvm-rc'

cea253a3 Clang: Fall back to llvm-rc when rc is unavailable
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !3687
parents 2beed5a4 cea253a3
Pipeline #144039 passed with stage
in 0 seconds
......@@ -99,6 +99,21 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
"or clang-cl as both C and C++ compilers.")
endif()
if(NOT CMAKE_RC_COMPILER_INIT)
# Check if rc is already in the path
# This may happen in cases where the user is already in a visual studio environment when CMake is invoked
find_program(__RC_COMPILER_PATH NAMES rc)
# Default to rc if it's available, otherwise fall back to llvm-rc
if(__RC_COMPILER_PATH)
set(CMAKE_RC_COMPILER_INIT rc)
else()
set(CMAKE_RC_COMPILER_INIT llvm-rc)
endif()
unset(__RC_COMPILER_PATH CACHE)
endif()
if ( "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC" OR "x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC" )
include(Platform/Windows-MSVC)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment