Let all smpi wrapper obey the VERBOSE variable

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

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index 2630654..09f156d 100755 (executable)
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -20,7 +20,7 @@ list_set CXXFLAGS "-std=gnu++11" @SMPI_CXX_FLAGS@
 list_set LINKARGS
 if [ "@WIN32@" != "1" ]; then
     list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
-    list_add CXXFLAGS "-fpic"
+    list_add CXXFLAGS "-fPIC"
     if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
        list_add LINKARGS "-shared"
     else
@@ -32,9 +32,6 @@ else
     list_add LINKARGS "@libdir@\libsimgrid.dll"
 fi
 
-# By default, we execute the commands instead of only showing them to cmake
-Show=
-
 list_set CMDARGS
 while [ $# -gt 0 ]; do
     ARG="$1"
@@ -65,7 +62,7 @@ while [ $# -gt 0 ]; do
             ;;
        '-show'|'-compile-info'|'-link-info')
             # Dry run displaying commands instead of executing them. Useful to cmake
-           Show=echo
+           show=1
            ;;
         *)
             list_add CMDARGS "${ARG}"
@@ -81,4 +78,8 @@ list_add_not_empty CMDLINE "${CMDARGS}"
 list_add_not_empty CMDLINE "${LINKARGS}"
 
 eval $(list_get CMDLINE)
-$Show "$@"
+if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then
+  echo "$@"
+  [ "x$show" = x1 ] && exit 0
+fi
+"$@"