Fix git-version in smpi scripts.

Thanks Tom Cornebize for reporting.

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 9db4630..7ed93ff 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -7,7 +7,7 @@
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 # 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@"

 
 CC=@CMAKE_C_COMPILER@
 
 
 CC=@CMAKE_C_COMPILER@
 

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index 6463277..ac2beeb 100755 (executable)
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -7,7 +7,7 @@
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 # 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@
 

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 588dee4..2bae978 100644 (file)
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -6,7 +6,7 @@
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 # 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@"

 
 REAL_FORTRAN_COMPILER=@SMPI_Fortran_COMPILER@
 
 
 REAL_FORTRAN_COMPILER=@SMPI_Fortran_COMPILER@
 

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 6bb53c0..fa32a9c 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -6,7 +6,7 @@
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 # 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@"

 
 REAL_FORTRAN_COMPILER=@SMPI_Fortran_COMPILER@
 
 
 REAL_FORTRAN_COMPILER=@SMPI_Fortran_COMPILER@
 

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 7f31a98..ef1eb1d 100755 (executable)
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -8,7 +8,7 @@
 @CMAKE_SMPI_COMMAND@
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 @CMAKE_SMPI_COMMAND@
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"

-SIMGRID_GITHASH="@SIMGRID_GITHASH@"
+SIMGRID_GITHASH="@GIT_VERSION@"

 
 DEFAULT_LOOPBACK_BANDWIDTH="498000000Bps"
 DEFAULT_LOOPBACK_LATENCY="0.000004s"
 
 DEFAULT_LOOPBACK_BANDWIDTH="498000000Bps"
 DEFAULT_LOOPBACK_LATENCY="0.000004s"