add option to output the right name in smpiff

it used to compile with the temporary name instead, for example with some NAS

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 9e78970..8bb046e 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -26,6 +26,9 @@ cleanup () {
 }
 trap 'cleanup' EXIT
 
 }
 trap 'cleanup' EXIT
 

+
+NEEDS_OUTPUT=1
+

 list_set CMDLINE "${F77}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
 list_set CMDLINE "${F77}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do


@@ -42,19 +45,28 @@ while [ $# -gt 0 ]; do
             list_add TMPFILES "${TMPFILE}"
       #replace "program main_name by subroutine user\_main (and the end clause as well)"
             sed 's/[[:space:]]\{6\}[[:space:]]*\(end \)\{0,1\}program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"
             list_add TMPFILES "${TMPFILE}"
       #replace "program main_name by subroutine user\_main (and the end clause as well)"
             sed 's/[[:space:]]\{6\}[[:space:]]*\(end \)\{0,1\}program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"

+            ORIGFILE="${ARG}"

             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;
         '-version' | '--version' | '-v')
             printf '%b\n' "$SIMGRID_VERSION"
             exit 0
             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;
         '-version' | '--version' | '-v')
             printf '%b\n' "$SIMGRID_VERSION"
             exit 0

-            ;;           
+            ;;
+        -o)
+            NEEDS_OUTPUT=0
+            list_add CMDLINE "-o"   
+            ;;        

         *)
             list_add CMDLINE "${ARG}"
             ;;
     esac
 done
 
         *)
             list_add CMDLINE "${ARG}"
             ;;
     esac
 done
 

+if [ $NEEDS_OUTPUT -ne 0 ]; then
+   list_add CMDLINE "-o${ORIGFILE%.f}.o"     
+fi
+

 list_add_not_empty CMDLINE ${INCLUDEARGS}
 list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
 list_add_not_empty CMDLINE "${LINKARGS}"
 list_add_not_empty CMDLINE ${INCLUDEARGS}
 list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
 list_add_not_empty CMDLINE "${LINKARGS}"