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
Fix getopt for BSD systems
[simgrid.git]
/
src
/
smpi
/
smpicxx.in
diff --git
a/src/smpi/smpicxx.in
b/src/smpi/smpicxx.in
index
241757c
..
9b45519
100755
(executable)
--- a/
src/smpi/smpicxx.in
+++ b/
src/smpi/smpicxx.in
@@
-1,6
+1,6
@@
#!/usr/bin/env sh
#!/usr/bin/env sh
-# Copyright (c) 2014-201
7
. The SimGrid Team.
+# Copyright (c) 2014-201
9
. The SimGrid Team.
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# All rights reserved.
# This program is free software; you can redistribute it and/or modify it
@@
-16,18
+16,20
@@
CMAKE_LINKARGS="-L@libdir@"
@SMPITOOLS_SH@
@SMPITOOLS_SH@
-list_set CXXFLAGS
+list_set CXXFLAGS
"-std=gnu++11"
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
list_set LINKARGS
if [ "@WIN32@" != "1" ]; then
-
# list_add CXXFLAGS "-Dmain=smpi_simulated_main_
"
- list_add CXXFLAGS "-fpic"
"-std=gnu++11"
+
list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h
"
+ list_add CXXFLAGS "-fpic"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
list_add LINKARGS "-shared"
+ else
+ echo "Warning: smpicxx pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
fi
fi
- list_add LINKARGS "-lsimgrid"
"-std=gnu++11"
+ list_add LINKARGS "-lsimgrid"
else
else
- list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h"
"-std=gnu++11"
- list_add LINKARGS "@libdir@\libsimgrid.dll"
"-std=gnu++11"
+ list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h"
+ list_add LINKARGS "@libdir@\libsimgrid.dll"
fi
list_set CMDARGS
fi
list_set CMDARGS