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
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
6f2e46a
..
09f156d
100755
(executable)
--- a/
src/smpi/smpicxx.in
+++ b/
src/smpi/smpicxx.in
@@
-16,11
+16,11
@@
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
@SMPITOOLS_SH@
-list_set CXXFLAGS "-std=gnu++11"
+list_set CXXFLAGS "-std=gnu++11"
@SMPI_CXX_FLAGS@
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
-
#
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
- list_add CXXFLAGS "-f
pic
"
+ list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
+ list_add CXXFLAGS "-f
PIC
"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
else
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
else
@@
-60,6
+60,10
@@
while [ $# -gt 0 ]; do
'-compiler-version' | '--compiler-version')
${CXX} --version
;;
'-compiler-version' | '--compiler-version')
${CXX} --version
;;
+ '-show'|'-compile-info'|'-link-info')
+ # Dry run displaying commands instead of executing them. Useful to cmake
+ show=1
+ ;;
*)
list_add CMDARGS "${ARG}"
;;
*)
list_add CMDARGS "${ARG}"
;;
@@
-74,4
+78,8
@@
list_add_not_empty CMDLINE "${CMDARGS}"
list_add_not_empty CMDLINE "${LINKARGS}"
eval $(list_get CMDLINE)
list_add_not_empty CMDLINE "${LINKARGS}"
eval $(list_get CMDLINE)
+if [ "x$VERBOSE" = x1 -o "x$show" = x1 ] ; then
+ echo "$@"
+ [ "x$show" = x1 ] && exit 0
+fi
"$@"
"$@"