noversionupdate

# HG changeset patch
# User sheepluva
# Date 1390210859 -3600
#      Mon Jan 20 10:40:59 2014 +0100
# Node ID ec966363adbeeb83a3ec56ad221f8a39126a7902
# Parent  7d21f52f04528049f483827b413ff9b76236f2c8
new cmake option NOVERSIONINFOUPDATE -- to be used if source is in a git/repo that is NOT the hedgewars repo

Gbp-Pq: Name noversionupdate.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6919c179627bc497b095828fc8ae9b4d250fa76d..50b975250cb33c2c2ed540a2ff76687815a2efaf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,8 @@ if(UNIX AND NOT APPLE)
     set(DATA_INSTALL_DIR "share/hedgewars" CACHE STRING "Resource folder path")
 endif()
 
+option(NOVERSIONINFOUPDATE "Disable update of version_info.txt. To be used if source is in a git/repo that is NOT the hedgewars repo" OFF)
+
 #system paths for finding required fonts (see share/hedgewars/Data/fonts)
 #subdirectories will NOT be searched.
 #all fonts that can't be found will be bundled with hedgewars

diff --git a/cmake_modules/revinfo.cmake b/cmake_modules/revinfo.cmake
index e15d448a4d42b36264ea3e8fe4a8d450c12a4b61..424211cc07da0343d7868a826ca8eec94dffe06c 100644 (file)
--- a/cmake_modules/revinfo.cmake
+++ b/cmake_modules/revinfo.cmake
@@ -1,7 +1,7 @@
 #detect Mercurial revision and init rev/hash information
 find_program(HGCOMMAND hg)
 find_program(GITCOMMAND git)
-if(EXISTS ${CMAKE_SOURCE_DIR}/.hg AND HGCOMMAND)
+if(EXISTS ${CMAKE_SOURCE_DIR}/.hg AND HGCOMMAND AND NOT NOVERSIONINFOUPDATE)
     execute_process(COMMAND ${HGCOMMAND} identify -in
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                     OUTPUT_VARIABLE internal_version
@@ -21,7 +21,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.hg AND HGCOMMAND)
 
     #write down hash and rev for easy picking should hg be missing
     file(WRITE "${CMAKE_SOURCE_DIR}/share/version_info.txt" "Hedgewars versioning information, do not modify\nrev ${HEDGEWARS_REVISION}\nhash ${HEDGEWARS_HASH}\n")
-elseif(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GITCOMMAND)
+elseif(EXISTS ${CMAKE_SOURCE_DIR}/.git AND GITCOMMAND AND NOT NOVERSIONINFOUPDATE)
     execute_process(COMMAND ${GITCOMMAND} rev-parse --short HEAD
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                     OUTPUT_VARIABLE HEDGEWARS_HASH