[geary] Report the branch & state rather than last tag in dev version string.

[Michael Gratton <mjog src gnome org>]

commit b1493275e5e6af909abbf9126bb910d32654f052
Author: Michael James Gratton <mike vee net>
Date:   Tue Feb 7 21:52:48 2017 +1100

    Report the branch & state rather than last tag in dev version string.

 cmake/gitversion.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/cmake/gitversion.cmake b/cmake/gitversion.cmake
index 303a632..15f63fc 100644
--- a/cmake/gitversion.cmake
+++ b/cmake/gitversion.cmake
@@ -1,12 +1,12 @@
 if (VERSION MATCHES "-dev$")
     find_package(Git QUIET)
     if (GIT_FOUND)
-        execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags
+        execute_process(COMMAND ${GIT_EXECUTABLE} describe --all --long --dirty
                         WORKING_DIRECTORY ${SRC_DIR}
                         OUTPUT_VARIABLE "GIT_VERSION"
                         OUTPUT_STRIP_TRAILING_WHITESPACE
                         ERROR_QUIET)
-        string(REGEX REPLACE "^geary-([0-9\\.]*)-([0-9]*)-(.*)" "\\1+\\2~\\3" GIT_VERSION "${GIT_VERSION}")
+        string(REGEX REPLACE "^heads\\/(.*)-0-(g.*)$" "\\1~\\2" GIT_VERSION "${GIT_VERSION}")
         set(VERSION ${GIT_VERSION})
     endif()
 endif()