From 9977fd2606f041a386eca3316bba31f18b72dc90 Mon Sep 17 00:00:00 2001
From: filux <smartadminpl@gmail.com>
Date: Sat, 31 Jan 2015 10:30:19 +0100
Subject: [PATCH] fixed 'Not a git repository' bug related with real out of
 source build from the git repository

---
 CMakeLists.txt                         | 2 +-
 source/g3d_viewer/CMakeLists.txt       | 2 +-
 source/glest_game/CMakeLists.txt       | 2 +-
 source/glest_map_editor/CMakeLists.txt | 2 +-
 source/shared_lib/CMakeLists.txt       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d2db2da6..32ce6c0a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,7 +242,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
                           OUTPUT_STRIP_TRAILING_WHITESPACE
                         )
 
-                        SET(GIT_LIVE_REV_CMD "`git rev-list HEAD --count`.`git log -1 --format=%h`")
+                        SET(GIT_LIVE_REV_CMD "`cd '${PROJECT_SOURCE_DIR}' && git rev-list HEAD --count`.`cd '${PROJECT_SOURCE_DIR}' && git log -1 --format=%h`")
 
                         MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}] CMD [${GIT_LIVE_REV_CMD}]")
 
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index ccad19e3e..b9fab2bf4 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -163,7 +163,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
 	IF(EXISTS ${HELP2MAN})
 		MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]")
 
-                SET(MG_MANPAGE_DESCRIPTION "G3D Model editor for the popular 3D realtime stragegy game")
+                SET(MG_MANPAGE_DESCRIPTION "G3D Model editor for the popular 3D realtime strategy game")
 
 		IF(EXISTS ${XVFB_EXEC})
 			MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
index eabc86651..f8255048e 100644
--- a/source/glest_game/CMakeLists.txt
+++ b/source/glest_game/CMakeLists.txt
@@ -317,7 +317,7 @@ IF(BUILD_MEGAGLEST)
 		  DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}data/core/misc_textures
 		  OPTIONAL REGEX "/.git" EXCLUDE)
 
-	        MESSAGE(STATUS "**Source package detected git folder structure.")
+	        #MESSAGE(STATUS "**Source package detected git folder structure.")
 
 	        # Installation of the program desktop file
 	        INSTALL(FILES 
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 33599e663..0651be77b 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -156,7 +156,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
 	IF(EXISTS ${HELP2MAN})
 		MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]")
 
-                SET(MG_MANPAGE_DESCRIPTION "Map editor for the popular 3D realtime stragegy game")
+                SET(MG_MANPAGE_DESCRIPTION "Map editor for the popular 3D realtime strategy game")
 
 		IF(EXISTS ${XVFB_EXEC})
 			MESSAGE("***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
index 75663f329..a9443b47a 100644
--- a/source/shared_lib/CMakeLists.txt
+++ b/source/shared_lib/CMakeLists.txt
@@ -455,7 +455,7 @@ option(FORCE_LUA_5_2 "Force looking for LUA 5.2" OFF)
 
 	IF(NOT WIN32)
 		ADD_LIBRARY(${TARGET_NAME} STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})
-		MESSAGE(STATUS "Building shared game library as a STATIC library and saving to [${LIBRARY_OUTPUT_PATH}]")
+		#MESSAGE(STATUS "Building shared game library as a STATIC library and saving to [${LIBRARY_OUTPUT_PATH}]")
 	ELSE()
 		SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/data/glest_game)
 		ADD_LIBRARY(${TARGET_NAME} STATIC ${MG_SOURCE_FILES} ${MG_INCLUDE_FILES})