[SMPI] Replay: Add typedefs

[simgrid.git] / src / smpi / smpicxx.in

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index 5bd4b1a..eb74fd1 100755 (executable)
--- 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-2018. 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@
 
@@ -18,11 +19,17 @@ CMAKE_LINKARGS="-L@libdir@"
 list_set CXXFLAGS
 list_set LINKARGS
 if [ "@WIN32@" != "1" ]; then
-    list_add CXXFLAGS "-Dmain=smpi_simulated_main_"
-    list_add LINKARGS "-lsimgrid"
+    # list_add CXXFLAGS "-Dmain=smpi_simulated_main_"
+    list_add CXXFLAGS "-fpic" "-std=gnu++11"
+    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" "-std=gnu++11"
 else
-    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h"
-    list_add LINKARGS "@libdir@\libsimgrid.dll"
+    list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h" "-std=gnu++11"
+    list_add LINKARGS "@libdir@\libsimgrid.dll" "-std=gnu++11"
 fi
 
 list_set CMDARGS
@@ -42,10 +49,17 @@ while [ $# -gt 0 ]; do
             fi
             list_add CMDARGS "${SRCFILE}"
             ;;
-        "-version" | "--version" | "-v")
+        '-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}"
       ;;