Skip to content

Commit

Permalink
(build) allow version string to use lw-tags
Browse files Browse the repository at this point in the history
It seems like 0.5.2 got tagged as a lightweight tag and not an annotated
tag. While not a big issue in itself, it also caused the --describe to
point to the wrong version when generating the versioned tag. This is
worse since it is used in crash dumps and so on to know what kind of a
build we are dealing with. Instead of messing with the tags further,
the build system is changed to accept lightweight tags in describe.

FossilOrigin-Name: 1fbda848689db387d8cd6fdde0c2b101aee21b02391185535951028db34b2056
  • Loading branch information
letoram committed May 29, 2017
1 parent 405ffd1 commit 87edb1c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Expand Up @@ -65,7 +65,7 @@ endif()
if (NOT DEFINED ENGINE_BUILDTAG)
find_package(Git)
if (GIT_FOUND)
execute_process(COMMAND ${GIT_EXECUTABLE} describe --always
execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE EXIT_CODE
OUTPUT_VARIABLE GIT_VERSION
Expand Down

0 comments on commit 87edb1c

Please sign in to comment.