forget to apply cleanups in MC on SMPI (separate MC_modelcheck for safety and liveness)

[simgrid.git] / buildtools / Cmake / CompleteInFiles.cmake

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index ac4a9e1..dcf4074 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -433,6 +433,7 @@ endif()
 ##
 if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
   execute_process(COMMAND git remote
+  COMMAND head -n 1
   WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
   OUTPUT_VARIABLE remote
   RESULT_VARIABLE ret
@@ -447,14 +448,14 @@ if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
   string(REPLACE "\n" "" url "${url}")
   #message(STATUS "Git url: ${url}")
   if(url)
-    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --oneline -1
+    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log --pretty=oneline --abbrev-commit -1
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
     OUTPUT_VARIABLE GIT_VERSION
     RESULT_VARIABLE ret
     )
     string(REPLACE "\n" "" GIT_VERSION "${GIT_VERSION}")
     message(STATUS "Git version: ${GIT_VERSION}")
-    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log -n 1 --format=%ai .
+    execute_process(COMMAND git --git-dir=${CMAKE_HOME_DIRECTORY}/.git log -n 1 --pretty=format:%ai .
     WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
     OUTPUT_VARIABLE GIT_DATE
     RESULT_VARIABLE ret
@@ -462,9 +463,9 @@ if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
     string(REPLACE "\n" "" GIT_DATE "${GIT_DATE}")
     message(STATUS "Git date: ${GIT_DATE}")
     string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
-    STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
-    STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
-    STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
+    STRING(REPLACE " +0000" "" GIT_DATE "${GIT_DATE}")
+    STRING(REPLACE " " "~" GIT_DATE "${GIT_DATE}")
+    STRING(REPLACE ":" "-" GIT_DATE "${GIT_DATE}")
   endif()
 endif()