From 85b72409481622c1f29e779f61f61f2f0a9bc64a Mon Sep 17 00:00:00 2001
From: pvdk <pvdkloet@gmail.com>
Date: Wed, 19 Feb 2014 13:43:14 +0100
Subject: [PATCH] Made the git version retrieval more reliable

---
 CMakeLists.txt                        | 54 ++++++++++++++++-----------
 cmake/GetGitRevisionDescription.cmake | 21 ++++++++---
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9d1f2017..5451fd131 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,27 +13,39 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 include(OpenMWMacros)
 
 # Version
-
-include(GetGitRevisionDescription)
-
-get_git_tag_revision(TAGHASH --tags --max-count=1 "HEAD...")
-get_git_head_revision(REFSPEC COMMITHASH)
-git_describe(VERSION --tags ${TAGHASH})
-
-string(REGEX MATCH "^openmw-[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" MATCH "${VERSION}")
-if (MATCH)
-    string(REGEX REPLACE "^openmw-([0-9]+)\\..*" "\\1" OPENMW_VERSION_MAJOR "${VERSION}")
-    string(REGEX REPLACE "^openmw-[0-9]+\\.([0-9]+).*" "\\1" OPENMW_VERSION_MINOR "${VERSION}")
-    string(REGEX REPLACE "^openmw-[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" OPENMW_VERSION_RELEASE "${VERSION}")
-
-    set(OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}")
-    set(OPENMW_VERSION_COMMITHASH "${COMMITHASH}")
-    set(OPENMW_VERSION_TAGHASH "${TAGHASH}")
-
-    message(STATUS "Configuring OpenMW ${OPENMW_VERSION}...")
-else (MATCH)
-    message(FATAL_ERROR "Failed to get valid version information from Git")
-endif (MATCH)
+set(OPENMW_VERSION_MAJOR 0)
+set(OPENMW_VERSION_MINOR 29)
+set(OPENMW_VERSION_RELEASE 0)
+
+set(OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}")
+
+if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
+    find_package(Git)
+
+    if(GIT_FOUND)
+        include(GetGitRevisionDescription)
+        get_git_tag_revision(TAGHASH --tags --max-count=1)
+        get_git_head_revision(REFSPEC COMMITHASH)
+        git_describe(VERSION --tags ${TAGHASH})
+
+        string(REGEX MATCH "^openmw-[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" MATCH "${VERSION}")
+        if(MATCH)
+            string(REGEX REPLACE "^openmw-([0-9]+)\\..*" "\\1" OPENMW_VERSION_MAJOR "${VERSION}")
+            string(REGEX REPLACE "^openmw-[0-9]+\\.([0-9]+).*" "\\1" OPENMW_VERSION_MINOR "${VERSION}")
+            string(REGEX REPLACE "^openmw-[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" OPENMW_VERSION_RELEASE "${VERSION}")
+
+            set(OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}")
+            set(OPENMW_VERSION_COMMITHASH "${COMMITHASH}")
+            set(OPENMW_VERSION_TAGHASH "${TAGHASH}")
+
+            message(STATUS "Configuring OpenMW ${OPENMW_VERSION}...")
+        else(MATCH)
+            message(WARNING "Failed to get valid version information from Git")
+        endif(MATCH)
+    else(GIT_FOUND)
+        message(WARNING "Git executable not found")
+    endif(GIT_FOUND)
+endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
 
 # doxygen main page
 
diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake
index fecd1654d..216eeb9fb 100644
--- a/cmake/GetGitRevisionDescription.cmake
+++ b/cmake/GetGitRevisionDescription.cmake
@@ -85,10 +85,6 @@ function(get_git_head_revision _refspecvar _hashvar)
 endfunction()
 
 function(git_describe _var)
-    if(NOT GIT_FOUND)
-        find_package(Git QUIET)
-    endif()
-
     #get_git_head_revision(refspec hash)
 
     if(NOT GIT_FOUND)
@@ -124,6 +120,20 @@ function(git_describe _var)
                     out
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+    if(NOT res EQUAL 0)
+        execute_process(COMMAND
+                        "${GIT_EXECUTABLE}"
+                        describe
+                        "--always"
+                        WORKING_DIRECTORY
+                        "${CMAKE_SOURCE_DIR}"
+                        RESULT_VARIABLE
+                        res
+                        OUTPUT_VARIABLE
+                        out
+                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif()
+
     if(NOT res EQUAL 0)
         set(out "${out}-${res}-NOTFOUND")
     endif()
@@ -133,7 +143,8 @@ endfunction()
 
 function(get_git_tag_revision _var)
     if(NOT GIT_FOUND)
-        find_package(Git QUIET)
+        set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+        return()
     endif()
 
     execute_process(COMMAND