First updates to the CMake files to support building with Portland Group.

Author: Damian Rouson

src/extensions/opencoarrays.F90

@@ -198,7 +198,11 @@ pure function logical_operator(lhs,rhs) result(lhs_op_rhs)
 
   ! --------------------
 
+#ifndef PORTLAND_GROUP_COMPILER
   integer(c_int), save, volatile, bind(C,name="CAF_COMM_WORLD") :: CAF_COMM_WORLD
+#else
+  integer(c_int), volatile, bind(C,name="CAF_COMM_WORLD") :: CAF_COMM_WORLD
+#endif
   integer(c_int32_t), parameter  :: bytes_per_word=4_c_int32_t
 
   interface gfc_descriptor

src/mpi/CMakeLists.txt

@@ -6,6 +6,8 @@ if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
   set(gfortran_compiler true)
 elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray")
   set(cray_compiler true)
+elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "PGI")
+  set(portland_group_compiler true)
 endif()
 
 if (NOT CMAKE_VERSION VERSION_LESS 3.3.1) 
@@ -24,15 +26,17 @@ else()
   endif()
 endif()
 
-if(opencoarrays_aware_compiler)
-else()
+if(NOT opencoarrays_aware_compiler)
   if(gfortran_compiler)
     # This applied to gfortran 4.9 and some earlier versions (FIX ME: find out which)
     add_definitions(-DCOMPILER_SUPPORTS_CAF_INTRINSICS)
   elseif (cray_compiler)
     # This applies to CCE 8.4 beta or earlier
     add_definitions(-DCOMPILER_LACKS_C_PTRDIFF_T)
     add_definitions(-DCOMPILER_LACKS_C_SIZEOF_ASSUMED_RANK)
+  elseif (portland_group_compiler)
+    add_definitions(-DCOMPILER_LACKS_C_PTRDIFF_T)
+    add_definitions(-DPORTLAND_GROUP_COMPILER)
   endif()
 endif()
 add_library(caf_mpi mpi_caf.c ../common/caf_auxiliary.c ../extensions/opencoarrays.F90)