From 7705e849132559bfd169a04c26296cc22f2d3743 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Fri, 30 Nov 2012 15:59:39 +0100 Subject: [PATCH] have the smpif90 file replace the main program clause by our own for f90 --- src/smpi/smpif90.in | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in index e86bd3851e..3724e84740 100644 --- a/src/smpi/smpif90.in +++ b/src/smpi/smpif90.in @@ -1,14 +1,14 @@ #! /bin/bash -CC=@CMAKE_REAL_Fortran_Compiler@ +CC=@CMAKE_Fortran_Compiler@ INCLUDEARGS="@includeflag@" CMAKE_LINKARGS="-L@libdir@" -FFLAGS="-O2 -cpp -Dprogram=subroutine -Dmain=user_main -ff2c " +FFLAGS="-O2 -ff2c " LINKARGS="-lsimgrid -lsmpi -lm -lgfortran" - - +main_name=main +TMPFILE=smpi_temp.f90 CMDLINE="" while [ -n "$1" ]; do ARG="$1" @@ -24,6 +24,9 @@ while [ -n "$1" ]; do if [ -z $SRCFILE ] ; then SRCFILE="$ARG" fi + #replace "program main_name by subroutine user\_main (and the end clause as well)" + sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/subroutine user\_main /g' ${ARG} > ${TMPFILE} + SRCFILE="./${TMPFILE}" CMDLINE="${CMDLINE} ${SRCFILE} " ;; *) @@ -34,5 +37,9 @@ done CMDLINE="${CC} ${FFLAGS} ${CMDLINE} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${LINKARGS}" -#echo "${CMDLINE}" +echo "${CMDLINE}" ${CMDLINE} + +if [ -f ${TMPFILE} ];then + rm ${TMPFILE} +fi -- 2.20.1