summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-11-11 15:44:57 +0000
committerKitware Robot <kwrobot@kitware.com>2021-11-11 10:45:19 -0500
commite2ceaec9916cb11f7190e7d17630c0de036a24a5 (patch)
tree68a290fc27de1bfb768b12a711c7bb5b10acfc20
parent0b8d69269717a225594d2e0d2bfbd61dbbf04fc9 (diff)
parent48f29b58053be4edfe4864f5cc6fcfbe6c1000f1 (diff)
downloadcmake-e2ceaec9916cb11f7190e7d17630c0de036a24a5.tar.gz
Merge topic 'IntelLLVM-no-xilink' into release-3.22
48f29b5805 IntelLLVM: Use MSVC linker with MSVC frontend variant Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6719
-rw-r--r--Modules/CMakeFindBinUtils.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeFindBinUtils.cmake b/Modules/CMakeFindBinUtils.cmake
index 6033ef6da4..6c81754d3c 100644
--- a/Modules/CMakeFindBinUtils.cmake
+++ b/Modules/CMakeFindBinUtils.cmake
@@ -85,7 +85,7 @@ if(("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_SIMULATE_ID}" STREQUAL "xMSVC" AND
list(PREPEND _CMAKE_MT_NAMES "llvm-mt")
list(PREPEND _CMAKE_LINKER_NAMES "lld-link")
list(APPEND _CMAKE_TOOL_VARS NM)
- elseif("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" MATCHES "^xIntel")
+ elseif("x${CMAKE_${_CMAKE_PROCESSING_LANGUAGE}_COMPILER_ID}" STREQUAL "xIntel")
list(PREPEND _CMAKE_AR_NAMES "xilib")
list(PREPEND _CMAKE_LINKER_NAMES "xilink")
endif()