A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Look for gfortran before enabling support for smpif90.
[simgrid.git]
/
src
/
smpi
/
smpif90.in
diff --git
a/src/smpi/smpif90.in
b/src/smpi/smpif90.in
index
d7cfde1
..
39ed749
100644
(file)
--- a/
src/smpi/smpif90.in
+++ b/
src/smpi/smpif90.in
@@
-1,14
+1,17
@@
#! /bin/bash
#! /bin/bash
-
CC=@CMAKE_Fortran_Compiler
@
+
F90=@GFORTRAN_EXE
@
INCLUDEARGS="@includeflag@"
CMAKE_LINKARGS="-L@libdir@"
INCLUDEARGS="@includeflag@"
CMAKE_LINKARGS="-L@libdir@"
-FFLAGS="-ff2c "
-LINKARGS="-lsimgrid -l
smpi -l
m -lgfortran"
+FFLAGS="-ff2c
-fno-second-underscore
"
+LINKARGS="-lsimgrid -lm -lgfortran"
main_name=main
main_name=main
-TMPFILE=$(mktemp).f90
+
+declare -a TMPFILES
+trap 'rm -f "${TMPFILES[@]}"' EXIT
+
CMDLINE=""
while [ -n "$1" ]; do
ARG="$1"
CMDLINE=""
while [ -n "$1" ]; do
ARG="$1"
@@
-20,12
+23,10
@@
while [ -n "$1" ]; do
CMDLINE="${CMDLINE} -c "
;;
*.f90|*.F90)
CMDLINE="${CMDLINE} -c "
;;
*.f90|*.F90)
- SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
- if [ -z $SRCFILE ] ; then
- SRCFILE="$ARG"
- fi
+ TMPFILE=$(mktemp "${ARG}_XXXXXX.f90")
+ TMPFILES+=( "${TMPFILE}" )
#replace "program main_name by subroutine user\_main (and the end clause as well)"
#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}
+ sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/subroutine user\_main /g
I;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI
' ${ARG} > ${TMPFILE}
SRCFILE="${TMPFILE}"
CMDLINE="${CMDLINE} ${SRCFILE} "
;;
SRCFILE="${TMPFILE}"
CMDLINE="${CMDLINE} ${SRCFILE} "
;;
@@
-35,11
+36,7
@@
while [ -n "$1" ]; do
esac
done
esac
done
-CMDLINE="${
CC
} ${FFLAGS} ${CMDLINE} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${LINKARGS}"
+CMDLINE="${
F90
} ${FFLAGS} ${CMDLINE} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${LINKARGS}"
-echo "${CMDLINE}"
+
#
echo "${CMDLINE}"
${CMDLINE}
${CMDLINE}
-
-if [ -f ${TMPFILE} ];then
- rm ${TMPFILE}
-fi