From a2e4f8e6b35a7d8232c64f8771b86da0a91f4af0 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Tue, 19 Jul 2011 16:55:47 +0200
Subject: [PATCH] Update cmake version script to use git describe instead of
 svn info.

---
 cmake/Version.cmake | 45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 3a0f0a08d..1b44ecc4f 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -6,8 +6,8 @@ set(CLEMENTINE_VERSION_MINOR 7)
 set(CLEMENTINE_VERSION_PATCH 1)
 #set(CLEMENTINE_VERSION_PRERELEASE rc1)
 
-# This should be set to OFF in an svn tag
-set(INCLUDE_SVN_REVISION ON)
+# This should be set to OFF in a tag
+set(INCLUDE_GIT_REVISION ON)
 
 # The format for version numbers is:
 # Display: $major.$minor[.$patch] [$prerelease] [r$svn]
@@ -35,26 +35,25 @@ if(CLEMENTINE_VERSION_PRERELEASE)
 endif(CLEMENTINE_VERSION_PRERELEASE)
 
 # Add svn revision
-if(FORCE_SVN_REVISION)
-  set(SVN_REVISION ${FORCE_SVN_REVISION})
-else(FORCE_SVN_REVISION)
-  include(FindSubversion)
-  find_package(Subversion)
+if(FORCE_GIT_REVISION)
+  set(GIT_REVISION ${FORCE_GIT_REVISION})
+else(FORCE_GIT_REVISION)
+  find_program(GIT_EXECUTABLE git)
 
-  if(Subversion_FOUND)
-    execute_process(COMMAND ${Subversion_SVN_EXECUTABLE} info ${PROJECT_SOURCE_DIR}
-        RESULT_VARIABLE SVN_INFO_RESULT
-        OUTPUT_QUIET
-        ERROR_QUIET)
-    if(${SVN_INFO_RESULT} EQUAL 0)
-      Subversion_WC_INFO(${PROJECT_SOURCE_DIR} clementine)
-      set(SVN_REVISION ${clementine_WC_REVISION})
-    endif(${SVN_INFO_RESULT} EQUAL 0)
-  endif(Subversion_FOUND)
-endif(FORCE_SVN_REVISION)
+  if(NOT GIT_EXECUTABLE-NOTFOUND)
+    execute_process(COMMAND ${GIT_EXECUTABLE} describe
+        RESULT_VARIABLE GIT_INFO_RESULT
+        OUTPUT_VARIABLE GIT_REV
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(${GIT_INFO_RESULT} EQUAL 0)
+      set(GIT_REVISION ${GIT_REV})
+    endif(${GIT_INFO_RESULT} EQUAL 0)
+  endif(NOT GIT_EXECUTABLE-NOTFOUND)
+endif(FORCE_GIT_REVISION)
 
-if(INCLUDE_SVN_REVISION AND SVN_REVISION)
-  set(CLEMENTINE_VERSION_DISPLAY "${CLEMENTINE_VERSION_DISPLAY} r${SVN_REVISION}")
-  set(CLEMENTINE_VERSION_DEB "${CLEMENTINE_VERSION_DEB}.r${SVN_REVISION}")
-  set(CLEMENTINE_VERSION_RPM "${CLEMENTINE_VERSION_RPM}.r${SVN_REVISION}")
-endif(INCLUDE_SVN_REVISION AND SVN_REVISION)
+if(INCLUDE_GIT_REVISION AND GIT_REVISION)
+  set(CLEMENTINE_VERSION_DISPLAY "${GIT_REVISION}")
+  set(CLEMENTINE_VERSION_DEB "${GIT_REVISION}")
+  set(CLEMENTINE_VERSION_RPM "${GIT_REVISION}")
+endif(INCLUDE_GIT_REVISION AND GIT_REVISION)