Browse Source

CompilerId: Drop MSVC conditions from ObjC and ObjC++

MSVC does not compile these languages.
Brad King 1 year ago
parent
commit
cf457fbf9c
2 changed files with 1 additions and 6 deletions
  1. 1 2
      Modules/CMakeOBJCCompilerId.m.in
  2. 0 4
      Modules/CMakeOBJCXXCompilerId.mm.in

+ 1 - 2
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

+ 0 - 4
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