Merge pull request #4975 from martin-frbg/fixup4974

Update Cray compiler options and calling convention in CMake

Author: martin-frbg

cmake/fc.cmake

@@ -257,13 +257,15 @@ if (${F_COMPILER} STREQUAL "COMPAQ")
 endif ()
 
 if (${F_COMPILER} STREQUAL "CRAY")
-  set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL")
+	set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_CRAYFC")
   set(FCOMMON_OPT "${FCOMMON_OPT} -hnopattern")
   if (INTERFACE64)
     set (FCOMMON_OPT "${FCOMMON_OPT} -s integer64")
   endif ()
   if (NOT USE_OPENMP)
-    set(FCOMMON_OPT "${FCOMMON_OPT} -O noomp")
+    set(FCOMMON_OPT "${FCOMMON_OPT} -fno-openmp")
+  else ()
+    set(FCOMMON_OPT "${FCOMMON_OPT} -fopenmp")
   endif ()
 endif ()