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}")