Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-05-11 07:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE] Avoid deprecated CMakeClDeps and CMakeForceCCompiler. CORE-17202

Browse source 
Also avoid now-unnecessary special-casing for ARM, and
remove CMAKE_SYSTEM_PROCESSOR check that can never be true.
This commit is contained in:
Thomas Faber 2020-08-15 21:43:01 +02:00
parent f363c27ab4
commit 40c5f7a8e2
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
toolchain-msvc.cmake
View file

@ -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")