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
various sonar fixes
[simgrid.git]
/
src
/
smpi
/
smpiff.in
diff --git
a/src/smpi/smpiff.in
b/src/smpi/smpiff.in
index
210645d
..
5fafa51
100644
(file)
--- a/
src/smpi/smpiff.in
+++ b/
src/smpi/smpiff.in
@@
-16,10
+16,12
@@
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
list_set FFLAGS @SMPI_Fortran_FLAGS@
@SMPITOOLS_SH@
list_set FFLAGS @SMPI_Fortran_FLAGS@
+list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
+else
+ echo "Warning: smpiff pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
fi
fi
-list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
list_set TMPFILES
main_name=main
list_set TMPFILES
main_name=main
@@
-36,7
+38,7
@@
filter_and_compile_f77() {
echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
fi
echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
fi
- sed 's/[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][[:space:]]*\([a-zA-Z0-9\-\_]*\)/ \1subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
+ sed 's/[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][[:space:]]
[[:space:]]
*\([a-zA-Z0-9\-\_]*\)/ \1subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
SRCFILE="${TMPFILE}"
list_add CMDLINE "${SRCFILE}"
}
SRCFILE="${TMPFILE}"
list_add CMDLINE "${SRCFILE}"
}
@@
-47,7
+49,7
@@
filter_and_compile_f90() {
echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
fi
echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
fi
- sed 's/[[:space:]]*[pP][rR][oO][gG][rR][aA][mM][[:space:]]
*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /g;s/[[:space:]]*[uU][sS][eE][[:space:]]*[mM][pP][iI]/\include \"mpif\.h\"
/g' "${ARG}" > "${TMPFILE}"
+ sed 's/[[:space:]]*[pP][rR][oO][gG][rR][aA][mM][[:space:]]
[[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main
/g' "${ARG}" > "${TMPFILE}"
SRCFILE="${TMPFILE}"
list_add CMDLINE "${SRCFILE}"
}
SRCFILE="${TMPFILE}"
list_add CMDLINE "${SRCFILE}"
}