BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Better version detection for shallow clones

Browse Source
This commit is contained in:
est31 2015-05-01 11:48:59 +02:00
parent 9e1e4b6284
commit 5704fb36d2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/Modules/GenerateVersion.cmake
View File

@ -3,7 +3,7 @@
if(VERSION_EXTRA) if(VERSION_EXTRA)
set(VERSION_GITHASH "${VERSION_STRING}") set(VERSION_GITHASH "${VERSION_STRING}")
else() else()
execute_process(COMMAND git describe --always --tag --dirty execute_process(COMMAND git describe --tag --dirty
WORKING_DIRECTORY "${GENERATE_VERSION_SOURCE_DIR}" WORKING_DIRECTORY "${GENERATE_VERSION_SOURCE_DIR}"
OUTPUT_VARIABLE VERSION_GITHASH OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE VERSION_GITHASH OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET) ERROR_QUIET)
@ -11,7 +11,16 @@ else()
if(VERSION_GITHASH) if(VERSION_GITHASH)
message(STATUS "*** Detected Git version ${VERSION_GITHASH} ***") message(STATUS "*** Detected Git version ${VERSION_GITHASH} ***")
else() else()
set(VERSION_GITHASH "${VERSION_STRING}") execute_process(COMMAND git describe --always --tag --dirty
WORKING_DIRECTORY "${GENERATE_VERSION_SOURCE_DIR}"
OUTPUT_VARIABLE VERSION_GITHASH OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
if(VERSION_GITHASH)
set(VERSION_GITHASH "${VERSION_STRING}-${VERSION_GITHASH}")
message(STATUS "*** Detected shallow Git version ${VERSION_GITHASH} ***")
else()
set(VERSION_GITHASH "${VERSION_STRING}")
endif()
endif() endif()
endif() endif()