diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-04 13:20:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-04 13:20:21 (GMT) |
| commit | a2b5ef3b366049664e9a569943672ee1fbfa59a8 (patch) | |
| tree | 98c5d8330912eed1e1e661070e3536d71f4c2386 /Modules | |
| parent | ce00bfd75ec5ad3f046a1c99285047d7ac98bc61 (diff) | |
| parent | 4ef6e27cb9c2e005d3d1f26ba6a99d164b1eee9d (diff) | |
| download | CMake-a2b5ef3b366049664e9a569943672ee1fbfa59a8.zip CMake-a2b5ef3b366049664e9a569943672ee1fbfa59a8.tar.gz CMake-a2b5ef3b366049664e9a569943672ee1fbfa59a8.tar.bz2 | |
Merge topic 'default-extensions' into release-3.23
4ef6e27cb9 CompilerId: Fix default extensions check for Clang targeting MSVC ABI
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6949
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCCompilerId.c.in | 3 | ||||
| -rw-r--r-- | Modules/CMakeCUDACompilerId.cu.in | 5 | ||||
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index 0cb8724..82d56cf 100644 --- a/Modules/CMakeCCompilerId.c.in +++ b/Modules/CMakeCCompilerId.c.in @@ -60,10 +60,9 @@ const char* info_language_standard_default = "INFO" ":" "standard_default[" C_VERSION "]"; const char* info_language_extensions_default = "INFO" ":" "extensions_default[" -/* !defined(_MSC_VER) to exclude Clang's MSVC compatibility mode. */ #if (defined(__clang__) || defined(__GNUC__) || defined(__xlC__) || \ defined(__TI_COMPILER_VERSION__)) && \ - !defined(__STRICT_ANSI__) && !defined(_MSC_VER) + !defined(__STRICT_ANSI__) "ON" #else "OFF" diff --git a/Modules/CMakeCUDACompilerId.cu.in b/Modules/CMakeCUDACompilerId.cu.in index becb9b4..d5a3b03 100644 --- a/Modules/CMakeCUDACompilerId.cu.in +++ b/Modules/CMakeCUDACompilerId.cu.in @@ -33,9 +33,8 @@ const char* info_language_standard_default = "INFO" ":" "standard_default[" "]"; const char* info_language_extensions_default = "INFO" ":" "extensions_default[" -/* !defined(_MSC_VER) to exclude Clang's MSVC compatibility mode. */ -#if (defined(__clang__) || defined(__GNUC__)) && !defined(__STRICT_ANSI__) && \ - !defined(_MSC_VER) +#if (defined(__clang__) || defined(__GNUC__)) && \ + !defined(__STRICT_ANSI__) "ON" #else "OFF" diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 4904249..f19bc97 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -66,10 +66,9 @@ const char* info_language_standard_default = "INFO" ":" "standard_default[" "]"; const char* info_language_extensions_default = "INFO" ":" "extensions_default[" -/* !defined(_MSC_VER) to exclude Clang's MSVC compatibility mode. */ #if (defined(__clang__) || defined(__GNUC__) || defined(__xlC__) || \ defined(__TI_COMPILER_VERSION__)) && \ - !defined(__STRICT_ANSI__) && !defined(_MSC_VER) + !defined(__STRICT_ANSI__) "ON" #else "OFF" |