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
[SMPI] Fix wrong usage of request->src() and dst() with ranks
[simgrid.git]
/
src
/
smpi
/
smpicxx.in
diff --git
a/src/smpi/smpicxx.in
b/src/smpi/smpicxx.in
index
1f2cb32
..
886a8dd
100755
(executable)
--- a/
src/smpi/smpicxx.in
+++ b/
src/smpi/smpicxx.in
@@
-1,25
+1,29
@@
#! /bin/sh
#! /bin/sh
-# Copyright (c) 2014. The SimGrid Team.
+# Copyright (c) 2014
-2017
. The SimGrid Team.
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# under the terms of the license (GNU LGPL) which comes with this package.
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# under the terms of the license (GNU LGPL) which comes with this package.
-CC=@CMAKE_CXX_COMPILER@
+SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
+SIMGRID_GITHASH="@SIMGRID_GITHASH@"
+
+CXX=@CMAKE_CXX_COMPILER@
INCLUDEARGS="@includeflag@"
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
INCLUDEARGS="@includeflag@"
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
-list_set CFLAGS
+list_set C
XX
FLAGS
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
- list_add CFLAGS "-Dmain=smpi_simulated_main_"
- list_add LINKARGS "-lsimgrid"
+ # list_add CXXFLAGS "-Dmain=smpi_simulated_main_"
+ list_add CXXFLAGS "-fpic"
+ list_add LINKARGS "-shared" "-lsimgrid"
else
else
- list_add CFLAGS "-include" "@includedir@/smpi/smpi_main.h"
+ list_add C
XX
FLAGS "-include" "@includedir@/smpi/smpi_main.h"
list_add LINKARGS "@libdir@\libsimgrid.dll"
fi
list_add LINKARGS "@libdir@\libsimgrid.dll"
fi
@@
-40,14
+44,25
@@
while [ $# -gt 0 ]; do
fi
list_add CMDARGS "${SRCFILE}"
;;
fi
list_add CMDARGS "${SRCFILE}"
;;
+ '-version' | '--version')
+ printf '%b\n' "$SIMGRID_VERSION"
+ exit 0
+ ;;
+ "-git-version" | "--git-version")
+ printf '%b\n' "$SIMGRID_GITHASH"
+ exit 0
+ ;;
+ '-compiler-version' | '--compiler-version')
+ ${CXX} --version
+ ;;
*)
list_add CMDARGS "${ARG}"
;;
esac
done
*)
list_add CMDARGS "${ARG}"
;;
esac
done
-list_set CMDLINE "${C
C
}"
-list_add_not_empty CMDLINE "${CFLAGS}"
+list_set CMDLINE "${C
XX
}"
+list_add_not_empty CMDLINE "${C
XX
FLAGS}"
list_add_not_empty CMDLINE ${INCLUDEARGS}
list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
list_add_not_empty CMDLINE "${CMDARGS}"
list_add_not_empty CMDLINE ${INCLUDEARGS}
list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
list_add_not_empty CMDLINE "${CMDARGS}"