X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=toolchain-msvc.cmake;h=c94493bf7dec6f8e6aa7267ee806f8cf119d01e5;hp=e0f2b2b8b3543cd9388baeb785c261880cf8fa09;hb=cac1bc12ae4e15badf6c93825d33023f3214c8a1;hpb=321bcc056d3a807b7c212f91663b592178f8b819

diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index e0f2b2b8b35..c94493bf7de 100644
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -14,13 +14,29 @@ set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 
 # which compilers to use for C and C++
-set(CMAKE_C_COMPILER cl)
+# clang-cl gets detected as "Clang" instead of "MSVC" so we force it here
+if(USE_CLANG_CL)
+    include(CMakeForceCompiler)
+    CMAKE_FORCE_C_COMPILER(clang-cl MSVC)
+    set(CMAKE_C_COMPILER_VERSION "16.00.40219.01")
+    if(ARCH STREQUAL "i386")
+        set(MSVC_C_ARCHITECTURE_ID "X86")
+    endif()
+    include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
+else()
+    set(CMAKE_C_COMPILER cl)
+endif()
 
 if(ARCH STREQUAL "arm")
     include(CMakeForceCompiler)
     CMAKE_FORCE_CXX_COMPILER(cl MSVC)
 else()
-set(CMAKE_CXX_COMPILER cl)
+    if(USE_CLANG_CL)
+        include(CMakeForceCompiler)
+        CMAKE_FORCE_CXX_COMPILER(clang-cl MSVC)
+    else()
+        set(CMAKE_CXX_COMPILER cl)
+    endif()
 endif()
 
 set(CMAKE_MC_COMPILER mc)