projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3013e15
)
[CMAKE/CLANG-CL] Force clang-cl's identity to be MSVC instead of the default Clang...
author
Amine Khaldi
<amine.khaldi@reactos.org>
Fri, 24 Nov 2017 11:01:43 +0000
(12:01 +0100)
committer
Amine Khaldi
<amine.khaldi@reactos.org>
Fri, 24 Nov 2017 11:03:01 +0000
(12:03 +0100)
toolchain-msvc.cmake
patch
|
blob
|
history
diff --git
a/toolchain-msvc.cmake
b/toolchain-msvc.cmake
index
6028e61
..
c94493b
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++
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)
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()
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)
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()
else()
set(CMAKE_CXX_COMPILER cl)
endif()