Let all smpi wrapper obey the VERBOSE variable

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

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 6b23f7c..8f46902 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -56,9 +56,6 @@ filter_and_compile_f90() {
 TRACE_CALL_LOCATION=0
 NEEDS_OUTPUT=1
 
-# By default, we execute the commands instead of only showing them to cmake
-Show=
-
 list_set CMDLINE "${REAL_FORTRAN_COMPILER}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
@@ -118,7 +115,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 CMDLINE "${ARG}"
@@ -135,4 +132,8 @@ list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
 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
+"$@"