coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-07-30 16:26:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix COMPILER_ID variable being set to MSVC with clang.exe on Windows

Browse Source 
Closes #9896

Signed-off-by: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
This commit is contained in:
Duncan Ogilvie 2026-02-20 11:43:01 +01:00
parent bebef8885c
commit 28c9e58d5d
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -78,11 +78,23 @@ endif()
option(DISABLE_PACKAGE_CONFIG_AND_INSTALL "Disable package configuration, target export and installation" ${MBEDTLS_AS_SUBPROJECT})
if (CMAKE_C_SIMULATE_ID)
# CMAKE_C_COMPILER_ID identifies the compiler family/ABI target, but not the
# command-line frontend. For Clang on Windows, this stays "Clang" for both
# clang.exe (GNU-style flags) and clang-cl.exe (MSVC-style flags).
# Use CMAKE_C_COMPILER_FRONTEND_VARIANT to select the expected flag syntax.
set(COMPILER_ID ${CMAKE_C_COMPILER_ID})
if (CMAKE_C_COMPILER_ID MATCHES "Clang")
if (CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
set(COMPILER_ID MSVC)
elseif (NOT CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "GNU" AND CMAKE_C_SIMULATE_ID)
# Fallback for old CMake versions that don't report
# CMAKE_C_COMPILER_FRONTEND_VARIANT.
set(COMPILER_ID ${CMAKE_C_SIMULATE_ID})
endif()
elseif (CMAKE_C_SIMULATE_ID)
set(COMPILER_ID ${CMAKE_C_SIMULATE_ID})
else()
set(COMPILER_ID ${CMAKE_C_COMPILER_ID})
endif(CMAKE_C_SIMULATE_ID)
endif()
string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${COMPILER_ID}")
string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${COMPILER_ID}")