diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-06-08 14:55:06 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-06-08 21:58:16 +0000 |
| commit | bdec712166ba924a2cdeaaca8ae580c343eaf02c (patch) | |
| tree | 6913d493ec80a5e9e7121e4dd92a4fa74c0a90ba /CMakeLists.txt | |
| parent | 46f9217c25477e8fa52abeca57398b0bb5ee4454 (diff) | |
| download | wireshark-bdec712166ba924a2cdeaaca8ae580c343eaf02c.tar.gz wireshark-bdec712166ba924a2cdeaaca8ae580c343eaf02c.tar.bz2 wireshark-bdec712166ba924a2cdeaaca8ae580c343eaf02c.zip | |
2.1.0 → 2.1.1.v2.1.1rc0
Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5
Reviewed-on: https://code.wireshark.org/review/15785
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aa4b24f156..12b8f13cdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,15 +178,15 @@ include(CMakeInstallDirs) set(GIT_REVISION 0) set(PROJECT_MAJOR_VERSION 2) set(PROJECT_MINOR_VERSION 1) -set(PROJECT_PATCH_VERSION 0) +set(PROJECT_PATCH_VERSION 1) set(PROJECT_BUILD_VERSION ${GIT_REVISION}) # Updated by make-version.pl -set(PROJECT_VERSION_EXTENSION) +set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}") 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 "") + set(PROJECT_VERSION_EXTENSION "-git") endif() endif() |