diff options
Diffstat (limited to 'Modules/CMakeFindBinUtils.cmake')
| -rw-r--r-- | Modules/CMakeFindBinUtils.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake index 73d57f0e06..d81fd1158c 100644 --- a/Modules/CMakeFindBinUtils.cmake +++ b/Modules/CMakeFindBinUtils.cmake @@ -66,6 +66,7 @@ if(("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC" AND OR "x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xMSVC" OR (CMAKE_HOST_WIN32 AND "x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xPGI") OR (CMAKE_HOST_WIN32 AND "x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xNVIDIA") + OR (CMAKE_HOST_WIN32 AND "x${_CMAKE_PROCESSING_LANGUAGE}" STREQUAL "xISPC") OR (CMAKE_GENERATOR MATCHES "Visual Studio" AND NOT CMAKE_VS_PLATFORM_NAME STREQUAL "Tegra-Android")) @@ -94,7 +95,11 @@ else() set(_CMAKE_ADDITIONAL_AR_NAMES "llvm-ar") set(_CMAKE_ADDITIONAL_RANLIB_NAMES "llvm-ranlib") set(_CMAKE_ADDITIONAL_STRIP_NAMES "llvm-strip") - set(_CMAKE_ADDITIONAL_LINKER_NAMES "ld.lld") + if("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC") + set(_CMAKE_ADDITIONAL_LINKER_NAMES "lld-link") + else() + set(_CMAKE_ADDITIONAL_LINKER_NAMES "ld.lld") + endif() set(_CMAKE_ADDITIONAL_NM_NAMES "llvm-nm") set(_CMAKE_ADDITIONAL_OBJDUMP_NAMES "llvm-objdump") set(_CMAKE_ADDITIONAL_OBJCOPY_NAMES "llvm-objcopy") |