From bdec712166ba924a2cdeaaca8ae580c343eaf02c Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 8 Jun 2016 14:55:06 -0700 Subject: =?UTF-8?q?2.1.0=20=E2=86=92=202.1.1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib8aab341be406d3c6e9139ae670489bd9e3edcc5 Reviewed-on: https://code.wireshark.org/review/15785 Reviewed-by: Gerald Combs --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') 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() -- cgit v1.2.1