X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce1289d4421b08ce6f69d8203784ee648671972e..5f1dc33c9f76ee99973ba93f034f031451398ebe:/src/smpi/smpicxx.in diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in index 5bd4b1ae39..886a8dd3f8 100755 --- a/src/smpi/smpicxx.in +++ b/src/smpi/smpicxx.in @@ -1,12 +1,13 @@ #! /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. SIMGRID_VERSION="@SIMGRID_VERSION_STRING@" +SIMGRID_GITHASH="@SIMGRID_GITHASH@" CXX=@CMAKE_CXX_COMPILER@ @@ -18,8 +19,9 @@ 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" + list_add LINKARGS "-shared" "-lsimgrid" else list_add CXXFLAGS "-include" "@includedir@/smpi/smpi_main.h" list_add LINKARGS "@libdir@\libsimgrid.dll" @@ -42,10 +44,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}" ;;