From 9a741a66a4982cf324834dc2f1e5cff6e6038ade Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Fri, 27 Dec 2013 11:15:36 +0100
Subject: Changed version display in bottom-right corner to be actually version
 number instead of date

---
 CMakeLists.txt | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 482186f..c4405d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,15 +21,22 @@ set(COLOBOT_VERSION_REVISION 2)
 set(COLOBOT_VERSION_UNRELEASED "+alpha")
 
 # Append git characteristics to version
-if(DEFINED COLOBOT_VERSION_UNRELEASED AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    find_package(Git)
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
-                    OUTPUT_VARIABLE GIT_BRANCH
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-                    OUTPUT_VARIABLE GIT_REVISION
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-    set(COLOBOT_VERSION_UNRELEASED "${COLOBOT_VERSION_UNRELEASED}-git-${GIT_BRANCH}~r${GIT_REVISION}")
+if(DEFINED COLOBOT_VERSION_UNRELEASED)
+    if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+        find_package(Git)
+        execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+                        OUTPUT_VARIABLE GIT_BRANCH
+                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+                        OUTPUT_VARIABLE GIT_REVISION
+                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+        set(COLOBOT_VERSION_UNRELEASED "${COLOBOT_VERSION_UNRELEASED}-git-${GIT_BRANCH}~r${GIT_REVISION}")
+        set(COLOBOT_VERSION_DISPLAY "git-${GIT_BRANCH}~r${GIT_REVISION}")
+    else()
+        set(COLOBOT_VERSION_DISPLAY "${COLOBOT_VERSION_CODENAME}-${COLOBOT_VERSION_UNRELEASED}")
+    endif()
+else()
+    set(COLOBOT_VERSION_DISPLAY "${COLOBOT_VERSION_MAJOR}.${COLOBOT_VERSION_MINOR}.${COLOBOT_VERSION_REVISION}${COLOBOT_VERSION_RELEASE_CODENAME}")
 endif()
 
 set(COLOBOT_VERSION_FULL "${COLOBOT_VERSION_MAJOR}.${COLOBOT_VERSION_MINOR}.${COLOBOT_VERSION_REVISION}${COLOBOT_VERSION_UNRELEASED}${COLOBOT_VERSION_RELEASE_CODENAME}")
-- 
cgit v1.2.3-1-g7c22