Let the git id be more accurate, regarding the "dirty" mark.

russellallen · Aug 15, 2012 · e18fb4d · e18fb4d
1 parent 077add4
commit e18fb4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/vm/cmake/configureVmDate.cmake.in b/vm/cmake/configureVmDate.cmake.in
@@ -2,7 +2,7 @@
 set(WIN32 @WIN32@) 
 set(UNIX @UNIX@) 
 set(PLATFORM "@platform_name@ @platform_processor@")
-set(GIT_DIR "@CMAKE_CURRENT_SOURCE_DIR@/../.git/")
+set(GIT_DIR "@CMAKE_CURRENT_SOURCE_DIR@/..")
 set(IN_FILE "@SRC_VMDATE_IN@") 
 set(OUT_FILE "@SRC_VMDATE@") 
 
@@ -44,7 +44,8 @@ execute_process(COMMAND git --version
 if(_git_not_there)
   set(GIT_REVISION "")
 else()
-  execute_process(COMMAND git --git-dir=${GIT_DIR} describe --tags --dirty
+  execute_process(COMMAND git describe --tags --dirty
+    WORKING_DIRECTORY "${GIT_DIR}"
     RESULT_VARIABLE git_result
     OUTPUT_VARIABLE GIT_REVISION 
     ERROR_VARIABLE GIT_REVISION 
@@ -60,4 +61,4 @@ endif()
 # PLATFORM
 # GIT_REVISION
 
-configure_file("${IN_FILE}" "${OUT_FILE}") 
+configure_file("${IN_FILE}" "${OUT_FILE}") 
diff --git a/vm/cmake/functions.cmake b/vm/cmake/functions.cmake
@@ -25,7 +25,8 @@ function(determine_build_information buildVar)
   if(_git_not_there)
     set(${buildVar} PARENT_SCOPE)
   else()
-    execute_process(COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/../.git describe --tags --dirty
+    execute_process(COMMAND git describe --tags --dirty
+      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.."
       RESULT_VARIABLE git_result
       OUTPUT_VARIABLE _revision 
       ERROR_VARIABLE _error