diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-09 11:45:00 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-07-09 11:45:00 -0400 |
| commit | 9029335b526767b50a6f3d06fc04a2ab7de7a381 (patch) | |
| tree | 0c2aa54c916299334b92b906b82cf551ceeb7fbe | |
| parent | ad793ce82544a0c88b2a612724c62fd93c94781b (diff) | |
| parent | 1c227583a4d331de94d35dd0bab7c8a5fb1697cd (diff) | |
| download | cmake-9029335b526767b50a6f3d06fc04a2ab7de7a381.tar.gz | |
Merge branch 'backport-3.20-intel-oneapi-std-windows' into release-3.20
Merge-request: !6328
| -rw-r--r-- | Modules/CMakeCCompilerId.c.in | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index 14e1282c83..0bc8f5adee 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 diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index c81796cfa1..95f28f6734 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -420,6 +420,19 @@ function(add_RunCMake_test_try_compile) set(CMAKE_C_STANDARD_DEFAULT "") endif() endif() + if(CMAKE_VERSION VERSION_LESS 3.20.6 AND "x${CMAKE_C_COMPILER_ID}" STREQUAL "xIntelLLVM" AND "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") + # Older CMake versions accidentally set the default standards to empty when + # IntelLLVM targets the MSVC ABI, thus not activating standard selection. + # Approximate the logic from IntelLLVM-{C,CXX}.cmake. + if(DEFINED CMAKE_C_STANDARD_DEFAULT AND "${CMAKE_C_STANDARD_DEFAULT}" STREQUAL "") + # FIXME: The compiler actually defaults to C17, but + # CMake does not yet model or detect that standard. + set(CMAKE_C_STANDARD_DEFAULT 11) + endif() + if(DEFINED CMAKE_CXX_STANDARD_DEFAULT AND "${CMAKE_CXX_STANDARD_DEFAULT}" STREQUAL "") + set(CMAKE_CXX_STANDARD_DEFAULT 14) + endif() + endif() foreach(var CMAKE_SYSTEM_NAME CMAKE_C_COMPILER_ID |