From cf457fbf9c88dddac53ad284eafb2cffe9586cb6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 16 Apr 2024 14:57:14 -0400 Subject: CompilerId: Drop MSVC conditions from ObjC and ObjC++ MSVC does not compile these languages. --- Modules/CMakeOBJCCompilerId.m.in | 3 +-- Modules/CMakeOBJCXXCompilerId.mm.in | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Modules/CMakeOBJCCompilerId.m.in b/Modules/CMakeOBJCCompilerId.m.in index 89bfe02..eff4f39 100644 --- a/Modules/CMakeOBJCCompilerId.m.in +++ b/Modules/CMakeOBJCCompilerId.m.in @@ -21,8 +21,7 @@ char const* qnxnto = "INFO" ":" "qnxnto[]"; @CMAKE_OBJC_COMPILER_ID_ERROR_FOR_TEST@ #if !defined(__STDC__) -# if (defined(_MSC_VER) && !defined(__clang__)) \ - || (defined(__ibmxl__) || defined(__IBMC__)) +# if defined(__ibmxl__) || defined(__IBMC__) # define C_VERSION "90" # else # define C_VERSION diff --git a/Modules/CMakeOBJCXXCompilerId.mm.in b/Modules/CMakeOBJCXXCompilerId.mm.in index 242b77f..23c25c5 100644 --- a/Modules/CMakeOBJCXXCompilerId.mm.in +++ b/Modules/CMakeOBJCXXCompilerId.mm.in @@ -23,11 +23,7 @@ char const* qnxnto = "INFO" ":" "qnxnto[]"; @CMAKE_OBJCXX_COMPILER_ID_PLATFORM_CONTENT@ @CMAKE_OBJCXX_COMPILER_ID_ERROR_FOR_TEST@ -#if defined(_MSC_VER) && defined(_MSVC_LANG) -#define CXX_STD _MSVC_LANG -#else #define CXX_STD __cplusplus -#endif const char* info_language_standard_default = "INFO" ":" "standard_default[" #if CXX_STD > 202002L -- cgit v0.12