X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=toolchain-msvc.cmake;h=c94493bf7dec6f8e6aa7267ee806f8cf119d01e5;hp=3d692605fca4c8b014007621afbc30e92ecba381;hb=4e697fee2c0df42bb2247377d11171cf790d05e6;hpb=5124294dd4d585d61446d054cd9587b37c1aab3a

diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index 3d692605fca..c94493bf7de 100644
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -3,17 +3,48 @@ if(NOT ARCH)
     set(ARCH i386)
 endif()
 
+# Default to Debug for the build type
+if(NOT DEFINED CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING
+        "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
+endif()
+
 # the name of the target operating system
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 
 # which compilers to use for C and C++
-set(CMAKE_C_COMPILER cl)
-set(CMAKE_CXX_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()
+    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)
 set(CMAKE_RC_COMPILER rc)
 if(ARCH STREQUAL "amd64")
     set(CMAKE_ASM_COMPILER ml64)
+elseif(ARCH STREQUAL "arm")
+    set(CMAKE_ASM_COMPILER armasm)
 else()
     set(CMAKE_ASM_COMPILER ml)
 endif()