X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3080c6b0d097d6b3b7d5b3dda0592154ce438f64..fae8bb2359200e3b42825d648a0e7ffcec168bb1:/src/smpi/smpicxx.in

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index b23a2740ff..2630654d71 100755
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -1,12 +1,13 @@
-#! /bin/sh
+#!/usr/bin/env sh
 
-# Copyright (c) 2014. The SimGrid Team.
+# Copyright (c) 2014-2019. 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@"
+SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 
 CXX=@CMAKE_CXX_COMPILER@
 
@@ -15,16 +16,25 @@ CMAKE_LINKARGS="-L@libdir@"
 
 @SMPITOOLS_SH@
 
-list_set CXXFLAGS
+list_set CXXFLAGS "-std=gnu++11" @SMPI_CXX_FLAGS@
 list_set LINKARGS
 if [ "@WIN32@" != "1" ]; then
-    list_add CXXFLAGS "-Dmain=smpi_simulated_main_"
+    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_helpers.h"
+    list_add CXXFLAGS "-fpic"
+    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
     list_add LINKARGS "-lsimgrid"
 else
     list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h"
     list_add LINKARGS "@libdir@\libsimgrid.dll"
 fi
 
+# By default, we execute the commands instead of only showing them to cmake
+Show=
+
 list_set CMDARGS
 while [ $# -gt 0 ]; do
     ARG="$1"
@@ -46,9 +56,17 @@ while [ $# -gt 0 ]; do
             printf '%b\n' "$SIMGRID_VERSION"
             exit 0
             ;;
+        "-git-version" | "--git-version")
+            printf '%b\n' "$SIMGRID_GITHASH"
+            exit 0
+            ;;
         '-compiler-version' | '--compiler-version')
             ${CXX} --version
             ;;
+	'-show'|'-compile-info'|'-link-info')
+            # Dry run displaying commands instead of executing them. Useful to cmake
+	    Show=echo
+	    ;;
         *)
             list_add CMDARGS "${ARG}"
       ;;
@@ -63,4 +81,4 @@ list_add_not_empty CMDLINE "${CMDARGS}"
 list_add_not_empty CMDLINE "${LINKARGS}"
 
 eval $(list_get CMDLINE)
-"$@"
+$Show "$@"