X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0748addf6f2e71e61e6ae97e7da38fc82143e558..fc13655cd995ed29d80dcd7b3427e0a4f3717f51:/buildtools/Cmake/src/CMakeCompleteInFiles.txt

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index a81b494c81..bc08f0106f 100644
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -313,16 +313,28 @@ endif(enable_lua)
 if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn)
 	find_file(SVN ".svn" ${PROJECT_DIRECTORY})
 	exec_program("svnversion ${PROJECT_DIRECTORY}" OUTPUT_VARIABLE "SVN_VERSION")
+	message("SVN_VERSION : ${SVN_VERSION}")
 endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.svn)
 
 if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
 	find_file(GIT ".git" ${PROJECT_DIRECTORY})
 	exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1 | sed 's| .*||'" OUTPUT_VARIABLE "GIT_VERSION")
 	exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE")
+	exec_program("git svn info" ${PROJECT_DIRECTORY} OUTPUT_VARIABLE "GIT_SVN_VERSION")
+	string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION})
 	STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
 	STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
 	STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
-	message("GIT_DATE : ${GIT_DATE}")
+	message("GIT_DATE 	: ${GIT_DATE}")
+	message("GIT_VERSION 	: ${GIT_VERSION}")
+	foreach(line ${GIT_SVN_VERSION})
+		string(REGEX MATCH "^Revision:.*" line_good ${line})
+		if(line_good)
+			string(REPLACE "Revision: " "" line_good ${line_good})
+			set(SVN_VERSION ${line_good})
+		endif(line_good)
+	endforeach(line ${GIT_SVN_VERSION})
+	message("GIT_SVN_VERSION : ${SVN_VERSION}")
 endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
 
 ###################################