Skip to content

Commit

Permalink
BUG: Automatic versioning based on git
Browse files Browse the repository at this point in the history
The automatic versioning based on git was not functioning
due to problems with extracting a valid tag
from the repository.  This has been made more
robust and comments added to assist with future updates.
  • Loading branch information
hjmjohnson committed Apr 21, 2015
1 parent 25181fe commit 51d3b9c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
10 changes: 5 additions & 5 deletions BRAINSCommonLib/BRAINSToolsVersionConfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*
*=========================================================================*/

#define BRAINSTools_VERSION_MAJOR @BRAINSTools_VERSION_MAJOR@
#define BRAINSTools_VERSION_MINOR @BRAINSTools_VERSION_MINOR@
#define BRAINSTools_VERSION_PATCH @BRAINSTools_VERSION_PATCH@
#define BRAINSTools_VERSION_TWEAK @BRAINSTools_VERSION_TWEAK@
#define BRAINSTools_VERSION "@BRAINSTools_VERSION@"
#define BRAINSTools_VERSION_MAJOR @BRAINSTools_VERSION_MAJOR@ //A number, so no quotes
#define BRAINSTools_VERSION_MINOR @BRAINSTools_VERSION_MINOR@ //A number, so no quotes
#define BRAINSTools_VERSION_PATCH @BRAINSTools_VERSION_PATCH@ //A number, so no quotes
#define BRAINSTools_VERSION_TWEAK @BRAINSTools_VERSION_TWEAK@ //A number, so no quotes
#define BRAINSTools_VERSION "@BRAINSTools_VERSION@"
8 changes: 8 additions & 0 deletions BRAINSTools.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ if( NOT ${PROJECT_NAME}_BUILD_DISTRIBUTE )
set(${PROJECT_NAME}_VERSION "${${PROJECT_NAME}_VERSION}-g${${PROJECT_NAME}_VERSION_HASH}")
endif()

message(STATUS "${PROJECT_NAME}_VERSION_MAJOR ${${PROJECT_NAME}_VERSION_MAJOR}")
message(STATUS "${PROJECT_NAME}_VERSION_MINOR ${${PROJECT_NAME}_VERSION_MINOR}")
message(STATUS "${PROJECT_NAME}_VERSION_PATCH ${${PROJECT_NAME}_VERSION_PATCH}")
message(STATUS "${PROJECT_NAME}_VERSION_TWEAK ${${PROJECT_NAME}_VERSION_TWEAK}")
message(STATUS "${PROJECT_NAME}_VERSION_RC ${${PROJECT_NAME}_VERSION_RC}")
message(STATUS "${PROJECT_NAME}_VERSION_HASH ${${PROJECT_NAME}_VERSION_HASH}")
message(STATUS "${PROJECT_NAME}_VERSION_POST ${${PROJECT_NAME}_VERSION_POST}")
message(STATUS "${PROJECT_NAME}_VERSION_DEV ${${PROJECT_NAME}_VERSION_DEV}")
message(STATUS "Building ${PROJECT_NAME} version \"${${PROJECT_NAME}_VERSION}\"")

include(FindITKUtil)
Expand Down
2 changes: 2 additions & 0 deletions Version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ include(ProjectSourceVersion)
## :%s/< *version *> *[^<]*</<version>4.4.0</g
## git commit
## git tag -a v4.4.0
## git push origin v4.4.0
## git push origin --tags ## DON'T forget to do this!
set(${PROJECT_NAME}_VERSION_MAJOR ${_GIT_VERSION_MAJOR})
set(${PROJECT_NAME}_VERSION_MINOR ${_GIT_VERSION_MINOR}) ## See note above for updating versions
set(${PROJECT_NAME}_VERSION_PATCH ${_GIT_VERSION_PATCH})
Expand Down

0 comments on commit 51d3b9c

Please sign in to comment.