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
add gatherv test
[simgrid.git]
/
src
/
smpi
/
smpicxx.in
diff --git
a/src/smpi/smpicxx.in
b/src/smpi/smpicxx.in
index 5c7d39c210f19e08b2a3d207789be9253b9f9ba9..59c4eee3a97a44ea35be555eee50bc89b80b54d2 100755
(executable)
--- a/
src/smpi/smpicxx.in
+++ b/
src/smpi/smpicxx.in
@@
-1,21
+1,21
@@
#!/usr/bin/env sh
#!/usr/bin/env sh
-# Copyright (c) 2014-202
0
. The SimGrid Team.
+# Copyright (c) 2014-202
3
. 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.
SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
# 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.
SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
-SIMGRID_GITHASH="@
SIMGRID_GITHASH
@"
+SIMGRID_GITHASH="@
GIT_VERSION
@"
CXX=@CMAKE_CXX_COMPILER@
CXX=@CMAKE_CXX_COMPILER@
-INCLUDEARGS="@includeflag@"
-CMAKE_LINKARGS="-L@libdir@"
-
@SMPITOOLS_SH@
@SMPITOOLS_SH@
+list_set INCLUDEARGS @includeflag@
+list_set CMAKE_LINKARGS "-L@libdir@"
+
list_set CXXFLAGS "-std=gnu++11" @SMPI_CXX_FLAGS@
list_set LINKARGS
list_set CXXFLAGS "-std=gnu++11" @SMPI_CXX_FLAGS@
list_set LINKARGS
@@
-25,11
+25,7
@@
else
LINKER_UNDEFINED_ERROR="1"
fi
LINKER_UNDEFINED_ERROR="1"
fi
-if [ "x@WIN32@" = "x1" ]; then
- 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@APPLE@" = "x1" ]; then
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add LINKARGS "-shared"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add LINKARGS "-shared"
@@
-40,7
+36,6
@@
elif [ "x@APPLE@" = "x1" ]; then
list_add LINKARGS "-lsimgrid" "-lm" ${LINKER_UNDEFINED_ERROR:+"-Wl,-undefined,error"}
fi
else
list_add LINKARGS "-lsimgrid" "-lm" ${LINKER_UNDEFINED_ERROR:+"-Wl,-undefined,error"}
fi
else
- list_add CXXFLAGS "-fPIC"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add LINKARGS "-shared"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
list_add LINKARGS "-shared"
@@
-90,9
+85,11
@@
while [ $# -gt 0 ]; do
esac
done
esac
done
+list_add CMDARGS "-fPIC"
+
list_set CMDLINE "${CXX}"
list_add_not_empty CMDLINE "${CXXFLAGS}"
list_set CMDLINE "${CXX}"
list_add_not_empty CMDLINE "${CXXFLAGS}"
-list_add_not_empty CMDLINE
${INCLUDEARGS}
+list_add_not_empty CMDLINE
"${INCLUDEARGS}"
list_add_not_empty CMDLINE "${CMAKE_LINKARGS}"
list_add_not_empty CMDLINE "${CMDARGS}"
list_add_not_empty CMDLINE "${LINKARGS}"
list_add_not_empty CMDLINE "${CMAKE_LINKARGS}"
list_add_not_empty CMDLINE "${CMDARGS}"
list_add_not_empty CMDLINE "${LINKARGS}"