Fix build id detecting.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9e41b6a0be3b4cea118cd399d841c3ba0988be4..806299ab010ea44bf61af9712e118b6a4a9d99f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -726,7 +726,7 @@ SET(ID "unknown")
 FIND_PROGRAM(HG "hg")
 
 IF(HG)
-    EXECUTE_PROCESS(COMMAND "${HG} id > /dev/null" OUTPUT_VARIABLE HG_ID)   
+    EXECUTE_PROCESS(COMMAND "${HG}" id OUTPUT_VARIABLE HG_ID ERROR_QUIET)   
     IF(HG_ID)
         STRING(REGEX MATCH ^[0-9a-z]+ ID "${HG_ID}")
     ELSE(HG_ID)
@@ -736,8 +736,17 @@ IF(HG)
             IF(HG_ID)
                 STRING(REGEX MATCH "node: [0-9a-z]+" _tmp "${HG_ID}")
                 STRING(SUBSTRING "${_tmp}" 6 12 ID)
-            ENDIF(HG_ID)
-        ENDIF(HG_ARCH)
+                       ENDIF(HG_ID)
+        ELSE(HG_ARCH)
+               # Maybe this is git copy
+               FIND_PROGRAM(GIT "git")
+               IF(GIT)
+                       EXECUTE_PROCESS(COMMAND "${GIT}" branch -v OUTPUT_VARIABLE GIT_ID ERROR_QUIET)
+                       IF(GIT_ID)
+                               STRING(REGEX REPLACE "^. [0-9a-z]+ ([0-9a-f]+) .*" \\1 ID "${GIT_ID}")
+                               ENDIF(GIT_ID)
+               ENDIF(GIT)
+       ENDIF(HG_ARCH)
     ENDIF(HG_ID)
 ELSE(HG)
 # Now check .hg_archival.txt
@@ -748,6 +757,15 @@ ELSE(HG)
             STRING(REGEX MATCH "node: [0-9a-z]+" _tmp "${HG_ID}")
             STRING(SUBSTRING "${_tmp}" 6 12 ID)
         ENDIF(HG_ID)
+    ELSE(HG_ARCH)
+       # Maybe this is git copy
+       FIND_PROGRAM(GIT "git")
+       IF(GIT)
+               EXECUTE_PROCESS(COMMAND "${GIT}" branch -v OUTPUT_VARIABLE GIT_ID ERROR_QUIET)
+               IF(GIT_ID)
+                       STRING(REGEX REPLACE "^. [0-9a-z]+ ([0-9a-f]+) .*" \\1 ID "${GIT_ID}")
+               ENDIF(GIT_ID)
+       ENDIF(GIT)
     ENDIF(HG_ARCH)
 ENDIF(HG)