diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-09-01 15:09:12 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-09-02 00:44:09 +0000 |
| commit | abd78dc12ba9a93c0672f409f10a7503e04535d2 (patch) | |
| tree | 3e206017e640987d015aa290c61d3c378f8a1fcd /CMakeLists.txt | |
| parent | 80181532b62c19521c658f3bb281e4956797a51c (diff) | |
| download | wireshark-abd78dc12ba9a93c0672f409f10a7503e04535d2.tar.gz | |
CMake: Move version declarations to the top of CMakeLists.txt.
This lets me be more lazy during releases.
Change-Id: Ie59e200f1f46282e9271f459c0bbf31dc74a59a7
Reviewed-on: https://code.wireshark.org/review/17450
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4646b25d97..ec6dc1370b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,20 @@ project(Wireshark C CXX) +# Updated by make-version.pl +set(GIT_REVISION 0) +set(PROJECT_MAJOR_VERSION 2) +set(PROJECT_MINOR_VERSION 3) +set(PROJECT_PATCH_VERSION 0) +set(PROJECT_BUILD_VERSION ${GIT_REVISION}) +set(PROJECT_VERSION_EXTENSION "") + +if(DEFINED ENV{WIRESHARK_VERSION_EXTRA}) + set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}") +endif() + +set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}") + message(STATUS "Generating build using CMake ${CMAKE_VERSION}") if(WIN32) # Needed for proper Qt linking. See @@ -174,20 +188,6 @@ endif() #Defines CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_DATADIR, etc ... include(CMakeInstallDirs) -# Updated by make-version.pl -set(GIT_REVISION 0) -set(PROJECT_MAJOR_VERSION 2) -set(PROJECT_MINOR_VERSION 3) -set(PROJECT_PATCH_VERSION 0) -set(PROJECT_BUILD_VERSION ${GIT_REVISION}) -set(PROJECT_VERSION_EXTENSION "") - -if(DEFINED ENV{WIRESHARK_VERSION_EXTRA}) - set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}") -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. if(DEFINED ENV{WIRESHARK_VERSION_FLAVOR}) set(VERSION_FLAVOR "$ENV{WIRESHARK_VERSION_FLAVOR}") |