[ros-diffs] [reactos] 01/10: [CMAKE] Avoid deprecated CMakeClDeps and CMakeForceCCompiler. CORE-17202

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40c5f7a8e224e9dac1202…

commit 40c5f7a8e224e9dac120239603096a0ca149c9e8
Author:     Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sat Aug 15 21:43:01 2020 +0200
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sun Aug 23 12:07:32 2020 +0200

    [CMAKE] Avoid deprecated CMakeClDeps and CMakeForceCCompiler. CORE-17202
    
    Also avoid now-unnecessary special-casing for ARM, and
    remove CMAKE_SYSTEM_PROCESSOR check that can never be true.
---
 toolchain-msvc.cmake | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index d1699c38d4a..f1ff2d77570 100644
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -13,30 +13,14 @@ endif()
 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)
-    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)
+    set(CMAKE_C_COMPILER clang-cl)
+    set(CMAKE_CXX_COMPILER clang-cl)
+    # Clang now defaults to lld-link which we're not compatible with yet
+    set(CMAKE_LINKER link)
 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()
+    set(CMAKE_CXX_COMPILER cl)
 endif()
 
 set(CMAKE_MC_COMPILER mc)
@@ -50,12 +34,7 @@ elseif(ARCH STREQUAL "arm64")
 else()
     set(CMAKE_ASM_COMPILER ml)
 endif()
-set(CMAKE_ASM_COMPILER_ID "VISUAL")
 
 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")