Merge pull request #254 from LLNL/bugfix/add_banner_hash

Always include the git hash in the Spheral python banner
LLNL · Jan 18, 2024 · 04b32f2 · 04b32f2
2 parents ab6e037 + b30b4fb
commit 04b32f2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/SimulationControl/CMakeLists.txt b/src/SimulationControl/CMakeLists.txt
@@ -1,19 +1,24 @@
 set(spheralversion "v${CMAKE_PROJECT_VERSION}")
 if (EXISTS ${CMAKE_SOURCE_DIR}/.git)
   execute_process(
-    COMMAND git --git-dir ${CMAKE_SOURCE_DIR}/.git describe --tags
+    COMMAND git --git-dir ${CMAKE_SOURCE_DIR}/.git describe --tags --abbrev=0
     OUTPUT_VARIABLE tagcomm
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  string(REPLACE "-" " " tagcomm "${tagcomm}")
+
+  execute_process(
+    COMMAND git --git-dir ${CMAKE_SOURCE_DIR}/.git rev-parse --short HEAD
+    OUTPUT_VARIABLE githash
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
 
   execute_process(
     COMMAND git --git-dir ${CMAKE_SOURCE_DIR}/.git rev-parse --abbrev-ref HEAD
     OUTPUT_VARIABLE abbref
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 
-  set(SPHERAL_VERSION_LIST ${tagcomm} ${abbref})
+  set(SPHERAL_VERSION_LIST ${tagcomm} ${githash} ${abbref})
   string(REPLACE ";" " " spheralversion "${SPHERAL_VERSION_LIST}")
 endif()
 configure_file(