diff options
| author | Raul Tambre <raul@tambre.ee> | 2021-02-07 09:27:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-09 15:27:47 (GMT) |
| commit | 1c14691a86ab8c6939dd04707dc2a92125fa8629 (patch) | |
| tree | 364455a3b21bdd9ba0b87aa41cc55582bb49e3e6 /Modules | |
| parent | 5115dd1e2c6651c7f4d5992d05300c248302886b (diff) | |
| download | CMake-1c14691a86ab8c6939dd04707dc2a92125fa8629.zip CMake-1c14691a86ab8c6939dd04707dc2a92125fa8629.tar.gz CMake-1c14691a86ab8c6939dd04707dc2a92125fa8629.tar.bz2 | |
CMakeCCompilerId: Fix C standard detection in Clang and IntelLLVM MSVC mode
Clang does not define `__STDC__` if in MSVC compatibility mode, but does
define `__STDC_VERSION__`. Avoid the fallback for this combination.
This backports commit 7596d8b951 (CMakeCCompilerId: Fix C standard
detection in Clang MSVC mode, 2021-02-07, v3.21.0-rc1~587^2~14) to the
3.20 release series. This is needed since commit 5115dd1e2c (IntelLLVM:
Fix C/C++ standard level flags on Windows, 2021-07-07, v3.21.0-rc3~7^2^2)
now that we activate C/C++ standard level logic for IntelLLVM when
targeting the MSVC ABI.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCCompilerId.c.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index 14e1282..0bc8f5a 100644 --- a/Modules/CMakeCCompilerId.c.in +++ b/Modules/CMakeCCompilerId.c.in @@ -33,9 +33,8 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; @CMAKE_C_COMPILER_ID_PLATFORM_CONTENT@ @CMAKE_C_COMPILER_ID_ERROR_FOR_TEST@ -#if !defined(__STDC__) -# if (defined(_MSC_VER) && !defined(__clang__)) \ - || (defined(__ibmxl__) || defined(__IBMC__)) +#if !defined(__STDC__) && !defined(__clang__) +# if defined(_MSC_VER) || defined(__ibmxl__) || defined(__IBMC__) # define C_DIALECT "90" # else # define C_DIALECT |