Skip to content

Commit

Permalink
Version number counting only looks for annotated tags. Re #4765.
Browse files Browse the repository at this point in the history
The code that determines the 'patch' version number uses 'git describe'.
This change means that git lightweight tags are not considered here,
so we can use them if needed without resetting the version number.
  • Loading branch information
RussellTaylor committed Feb 7, 2012
1 parent 09751ce commit 8dbfaf2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Code/Mantid/Build/CMake/CommonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ set ( NOT_GIT_REPO "Not" )
find_package ( Git )
if ( GIT_FOUND )
# Get the last revision
execute_process ( COMMAND ${GIT_EXECUTABLE} describe --tags --long
execute_process ( COMMAND ${GIT_EXECUTABLE} describe --long
OUTPUT_VARIABLE GIT_DESCRIBE
ERROR_VARIABLE NOT_GIT_REPO
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
Expand Down

0 comments on commit 8dbfaf2

Please sign in to comment.