Try to help for freebsd and paths. Thanks Matthieu Volat for the hints.

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

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index 86090a3..859a84e 100755 (executable)
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -26,12 +26,12 @@ else
 fi
 
 if [ "x@WIN32@" = "x1" ]; then
-    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h"
+    list_add CXXFLAGS "-include" "\"@includedir@/smpi/smpi_main.h\""
     list_add LINKARGS "@libdir@\libsimgrid.dll"
 elif [ "x@APPLE@" = "x1" ]; then
     list_add CXXFLAGS "-fPIC"
     if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
-       list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
+       list_add CXXFLAGS "-include" "\"@includedir@/smpi/smpi_helpers.h\""
        list_add LINKARGS "-shared"
     else
        echo "Warning: smpicc pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
@@ -42,7 +42,7 @@ elif [ "x@APPLE@" = "x1" ]; then
 else
     list_add CXXFLAGS "-fPIC"
     if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
-       list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
+       list_add CXXFLAGS "-include" "\"@includedir@/smpi/smpi_helpers.h\""
        list_add LINKARGS "-shared"
     else
        echo "Warning: smpicc pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
@@ -67,7 +67,7 @@ while [ $# -gt 0 ]; do
             if [ -z "$SRCFILE" ] ; then
                 SRCFILE="$ARG"
             fi
-            list_add CMDARGS "${SRCFILE}"
+            list_add CMDARGS "\"${SRCFILE}\""
             ;;
         '-version' | '--version')
             printf '%b\n' "$SIMGRID_VERSION"
@@ -102,4 +102,4 @@ if [ "x$VERBOSE" = x1 ] || [ "x$show" = x1 ] ; then
   echo "$@"
   [ "x$show" = x1 ] && exit 0
 fi
-"$@"
+eval "$@"