diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-04-21 00:38:20 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-04-21 18:59:40 +0000 |
| commit | 7c6e859ccf210a45e1cc0f6da17692845e6b5a23 (patch) | |
| tree | 28190bb08ca312ca86e5ab3522ac7ca381648aa7 /CMakeLists.txt | |
| parent | eeded812f727e6b49e5b1049640a4a29a02d0d46 (diff) | |
Add "-git" tag to version
Add a static "-git" extra version tag for VCS snapshot builds, to be
replaced when running 'make-version -r'.
Change-Id: If29fca04029ed3129aa2332492dc536091049955
Reviewed-on: https://code.wireshark.org/review/15032
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a473b67095..9a4800ae9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,7 +180,16 @@ set(PROJECT_MAJOR_VERSION 2) set(PROJECT_MINOR_VERSION 1) set(PROJECT_PATCH_VERSION 0) set(PROJECT_BUILD_VERSION ${GIT_REVISION}) -set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}") +# Updated by make-version.pl +set(PROJECT_VERSION_EXTENSION) +if(NOT DEFINED PROJECT_VERSION_EXTENSION) + if (DEFINED ENV{WIRESHARK_VERSION_EXTRA}) + set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}") + else() + set(PROJECT_VERSION_EXTENSION "-git") + endif() +endif() + set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}") # Banner shown at top right of Qt welcome screen. |