[ADVPACK] Sync with Wine Staging 3.17. CORE-15127

[reactos.git] / toolchain-msvc.cmake

diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index 6028e61..87d31a4 100644 (file)
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -14,8 +14,15 @@ set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 
 # which compilers to use for C and C++
+# clang-cl gets detected as "Clang" instead of "MSVC" so we force it here
 if(USE_CLANG_CL)
-    set(CMAKE_C_COMPILER 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()
@@ -25,7 +32,8 @@ if(ARCH STREQUAL "arm")
     CMAKE_FORCE_CXX_COMPILER(cl MSVC)
 else()
     if(USE_CLANG_CL)
-        set(CMAKE_CXX_COMPILER clang-cl)
+        include(CMakeForceCompiler)
+        CMAKE_FORCE_CXX_COMPILER(clang-cl MSVC)
     else()
         set(CMAKE_CXX_COMPILER cl)
     endif()
@@ -47,3 +55,5 @@ set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")
 if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
     add_definitions(-D__i386__)
 endif()
+
+set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-msvc.cmake")