Fix build when an older version of simgrid is already installed.

[simgrid.git] / src / smpi / smpicc.in

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index c5627b3..d88318f 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -1,16 +1,16 @@
-#! /bin/bash
+#! /bin/sh
 
 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@"
 
-if [ @WIN32@ != 1 ]; then
-LINKARGS="-lsimgrid -lsmpi -lm"
-CFLAGS="-O2 -Dmain=smpi_simulated_main"
+if [ "@WIN32@" != "1" ]; then
+  CFLAGS="-Dmain=smpi_simulated_main_"
+  LINKARGS="-lsimgrid"
 else
-CFLAGS="-O2 -include @includedir@/smpi/smpi_main.h"
-LINKARGS="@CMAKE_BINARY_DIR@\lib\libsimgrid.dll @CMAKE_BINARY_DIR@\lib\libsmpi.dll"
+  CFLAGS="-include @includedir@/smpi/smpi_main.h"
+  LINKARGS="@libdir@\libsimgrid.dll"
 fi
 
 CMDLINE=""
@@ -19,6 +19,7 @@ while [ -n "$1" ]; do
   shift
   case "${ARG}" in
    -c)
+      CMAKE_LINKARGS=""
       LINKARGS=""
       CMDLINE="${CMDLINE} -c "
       ;;
@@ -35,7 +36,7 @@ while [ -n "$1" ]; do
   esac
 done
 
-CMDLINE="${CC} ${CFLAGS} ${CMDLINE} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${LINKARGS}"
+CMDLINE="${CC} ${CFLAGS} ${INCLUDEARGS} ${CMAKE_LINKARGS} ${CMDLINE} ${LINKARGS}"
 
 #echo "${CMDLINE}"
 ${CMDLINE}