Merge topic 'CrayPrgEnv-detection'

23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms"

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5889

Modules/CMakeCCompilerId.c.in

@@ -26,7 +26,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
 char const* qnxnto = "INFO" ":" "qnxnto[]";
 #endif
 
-#if defined(_CRAYC) || defined(__cray__)
+#if defined(__CRAYXE) || defined(__CRAYXC)
 char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]";
 #endif
 
@@ -80,7 +80,7 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
-#if defined(_CRAYC) || defined(__cray__)
+#if defined(__CRAYXE) || defined(__CRAYXC)
   require += info_cray[argc];
 #endif
   require += info_language_dialect_default[argc];

Modules/CMakeCXXCompilerId.cpp.in

@@ -20,7 +20,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]";
 char const* qnxnto = "INFO" ":" "qnxnto[]";
 #endif
 
-#if defined(_CRAYC) || defined(__cray__)
+#if defined(__CRAYXE) || defined(__CRAYXC)
 char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]";
 #endif
 
@@ -78,7 +78,7 @@ int main(int argc, char* argv[])
 #ifdef SIMULATE_VERSION_MAJOR
   require += info_simulate_version[argc];
 #endif
-#if defined(_CRAYC) || defined(__cray__)
+#if defined(__CRAYXE) || defined(__CRAYXC)
   require += info_cray[argc];
 #endif
   require += info_language_dialect_default[argc];

Modules/CMakeFortranCompilerId.F.in

@@ -139,7 +139,7 @@
 #else
         PRINT *, 'INFO:compiler[]'
 #endif
-#if defined(_CRAYFTN)
+#if defined(__CRAYXE) || defined(__CRAYXC)
         PRINT *, 'INFO:compiler_wrapper[CrayPrgEnv]'
 #endif