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
Merge branch 'torus'
[simgrid.git]
/
src
/
smpi
/
smpicc.in
diff --git
a/src/smpi/smpicc.in
b/src/smpi/smpicc.in
index
a508a38
..
e5270a2
100755
(executable)
--- a/
src/smpi/smpicc.in
+++ b/
src/smpi/smpicc.in
@@
-1,41
+1,51
@@
-#! /bin/
ba
sh
+#! /bin/sh
CC=@CMAKE_C_COMPILER@
CC=@CMAKE_C_COMPILER@
-INCLUDEARGS="
-I@includedir@ -I@includedir@/smpi -I@CMAKE_BINARY_DIR@/include
"
-CMAKE_LINKARGS="-L@
CMAKE_LINKARGS
@"
+INCLUDEARGS="
@includeflag@
"
+CMAKE_LINKARGS="-L@
libdir
@"
+@SMPITOOLS_SH@
+
+list_set CFLAGS
+list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
if [ "@WIN32@" != "1" ]; then
-
LINKARGS="-lsimgrid -lsmpi -lm
"
-
CFLAGS="-O2 -Dmain=smpi_simulated_main
"
+
list_add CFLAGS "-Dmain=smpi_simulated_main_
"
+
list_add LINKARGS "-lsimgrid
"
else
else
-
CFLAGS="-O2 -include
@includedir@/smpi/smpi_main.h"
-
LINKARGS="@CMAKE_BINARY_DIR@\lib\libsimgrid.dll @CMAKE_BINARY_DIR@\lib\libsmpi
.dll"
+
list_add CFLAGS "-include" "
@includedir@/smpi/smpi_main.h"
+
list_add LINKARGS "@libdir@\libsimgrid
.dll"
fi
fi
-CMDLINE=""
-while [ -n "$1" ]; do
- ARG="$1"
- shift
- case "${ARG}" in
- -c)
- LINKARGS=""
- CMDLINE="${CMDLINE} -c "
- ;;
- *.c)
- SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
- if [ -z $SRCFILE ] ; then
- SRCFILE="$ARG"
- fi
- CMDLINE="${CMDLINE} ${SRCFILE} "
- ;;
- *)
- CMDLINE="${CMDLINE} ${ARG} "
+list_set CMDARGS
+while [ $# -gt 0 ]; do
+ ARG="$1"
+ shift
+ case "${ARG}" in
+ -c)
+ CMAKE_LINKARGS=""
+ LINKARGS=""
+ list_add CMDARGS "-c"
+ ;;
+ *.c)
+ SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
+ if [ -z "$SRCFILE" ] ; then
+ SRCFILE="$ARG"
+ fi
+ list_add CMDARGS "${SRCFILE}"
+ ;;
+ *)
+ list_add CMDARGS "${ARG}"
;;
esac
done
;;
esac
done
-CMDLINE="${CC} ${CFLAGS} ${CMDLINE} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${LINKARGS}"
+list_set CMDLINE "${CC}"
+list_add_not_empty CMDLINE "${CFLAGS}"
+list_add_not_empty CMDLINE ${INCLUDEARGS}
+list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
+list_add_not_empty CMDLINE "${CMDARGS}"
+list_add_not_empty CMDLINE "${LINKARGS}"
-#echo "${CMDLINE}"
-${CMDLINE}
+eval $(list_get CMDLINE)
+"$@"