Renaming the environment variable invoked by caf compiler wrapper to prevent infinite recursion when building CAF application codes with CMake.

Author: Damian Rouson

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 #Name project and specify source languages
-project(opencoarrays VERSION 1.1.1 LANGUAGES C Fortran)
+project(opencoarrays VERSION 1.1.2 LANGUAGES C Fortran)
 
 #Print an error message on an attempt to build inside the source directory tree:
 if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")

src/extensions/caf-foot

@@ -28,8 +28,8 @@ usage()
     echo "      * appear before all other arguments,"
     echo "      * be the only Fortran source file in the argument list,"
     echo "      * have a name of the form *.f90, *.F90, *.f, or *.F. "
-    echo "   c. The environment variable 'FC' must be empty or point to a Fortran compiler/linker. "
-    echo "   d. If 'FC' is empty, a default value of 'mpif90' is used. "
+    echo "   c. The environment variable 'CAFC' must be empty or point to a Fortran compiler/linker. "
+    echo "   d. If 'CAFC' is empty, a default value of 'mpif90' is used. "
     echo ""
     echo " 2. With non-OCA CAF compilers (Intel or Cray),"
     echo "   a. Observe restrictions 1a-d above."
@@ -60,9 +60,9 @@ if [ $# == 0 ]; then
   exit 1
 fi
 
-# Default to "mpif90" Fortran compiler if environment variable FC has zero length:
-if [ -z "$FC" ]; then
-   FC=mpif90
+# Default to "mpif90" Fortran compiler if environment variable CAFC has zero length:
+if [ -z "$CAFC" ]; then
+   CAFC=mpif90
 fi
 
 # TODO -- improve the syntax of the "set" command below to accepted an unlimited number of arguments
@@ -80,14 +80,14 @@ if [[ $1 == '-v' || $1 == '-V' || $1 == '--version' ]]; then
     echo "the file named COPYRIGHT-BSD3."
     echo ""
 elif [[ $1 == '-w' || $1 == '--wrapping' || $1 == '--wraps' ]]; then
-  echo "caf wraps FC=$FC"
+  echo "caf wraps CAFC=$CAFC"
 elif [[ $1 == '-h' || $1 == '--help' ]]; then
   # Print usage information
   usage | less
   exit 1
 elif [ "$caf_compiler" = "true" ]; then
   # Nothing to do other than invoke the compiler with all the command-line arguments:
-  $FC "$@" -L $caf_lib_dir $link_args
+  $CAFC "$@" -L $caf_lib_dir $link_args
 else
   # Verify that a file with the .f90, .F90, .f, or .F extension is the first argument:
   src_extension=`echo "$1" | cut -f2 -d'.'`
@@ -108,7 +108,7 @@ else
     # Replace the file name in command-line argment 1 with the new name beofre invoking the compiler:
     set -- "caf-$1" "${@:2:max_arguments}"
     # Invoke the compiler along with all command-line arguments:
-    $FC "$@" -L $caf_lib_dir -I $caf_mod_dir $link_args
+    $CAFC "$@" -L $caf_lib_dir -I $caf_mod_dir $link_args
   else
     # Print usage information upon encountering an unknowon CAF source file extension
     usage | less