lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-30 14:34:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE/CLANG-CL] Force clang-cl's identity to be MSVC instead of the default Clang one as the latter results in skipping several MSVC related CMake checks/tasks. CORE-11799

Browse Source
This commit is contained in:
Amine Khaldi
2017-11-24 12:01:43 +01:00
parent 3013e153b0
commit 10f3006978
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
toolchain-msvc.cmake
View File

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