diff options
| author | Tom Cosgrove <tom.cosgrove@arm.com> | 2024-06-24 11:28:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-24 11:28:39 +0000 |
| commit | dd48f0f23f8b5189031d6f3ac519b2b6113bd9e7 (patch) | |
| tree | e997e6739efd9dbd39f400e98683b6b4da2f2359 | |
| parent | d9392f0fddcb3c020279c674012e058a3a1d4956 (diff) | |
| parent | 3766a3225bc7303778416dde11acadc23b67a9aa (diff) | |
| download | mbedtls-development.zip mbedtls-development.tar.gz mbedtls-development.tar.bz2 | |
Merge pull request #8389 from daantimmer/patch-1HEADdevelopmentcoverity_scan
Use CMAKE_C_SIMULATE_ID when available to determine compiler
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b52058a..35b8d48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,10 +73,16 @@ endif() option(DISABLE_PACKAGE_CONFIG_AND_INSTALL "Disable package configuration, target export and installation" ${MBEDTLS_AS_SUBPROJECT}) -string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}") -string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${CMAKE_C_COMPILER_ID}") -string(REGEX MATCH "IAR" CMAKE_COMPILER_IS_IAR "${CMAKE_C_COMPILER_ID}") -string(REGEX MATCH "MSVC" CMAKE_COMPILER_IS_MSVC "${CMAKE_C_COMPILER_ID}") +if (CMAKE_C_SIMULATE_ID) + set(COMPILER_ID ${CMAKE_C_SIMULATE_ID}) +else() + set(COMPILER_ID ${CMAKE_C_COMPILER_ID}) +endif(CMAKE_C_SIMULATE_ID) + +string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${COMPILER_ID}") +string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${COMPILER_ID}") +string(REGEX MATCH "IAR" CMAKE_COMPILER_IS_IAR "${COMPILER_ID}") +string(REGEX MATCH "MSVC" CMAKE_COMPILER_IS_MSVC "${COMPILER_ID}") # the test suites currently have compile errors with MSVC if(CMAKE_COMPILER_IS_MSVC) @@ -184,8 +190,6 @@ function(get_name_without_last_ext dest_var full_name) set(${dest_var} ${no_ext_name} PARENT_SCOPE) endfunction(get_name_without_last_ext) -string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}") - include(CheckCCompilerFlag) set(CMAKE_C_EXTENSIONS OFF) |