diff options
| author | Gerald Combs <gerald@zing.org> | 2015-01-10 14:41:55 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-10 22:57:53 +0000 |
| commit | b2f03cb7db611a469741904012d742d27209dc84 (patch) | |
| tree | 717ef116aa88ca1567413ebfd6b57b34e22f4ac3 /CMakeLists.txt | |
| parent | 2219f78426b4522b6acec6c18f98c3c0156f110a (diff) | |
| download | wireshark-b2f03cb7db611a469741904012d742d27209dc84.tar.gz | |
make-version.pl updates.
Set the version variables in CMakeLists.txt directly from
make-version.pl instead of pulling them from configure.ac.
Use the correct default value for VERSION_EXTRA in config.nmake.
wireshark-common.files was removed in g97e1491. We don't need to update
it any more.
Change-Id: I751b6df9ac16e19090712aa79a68e308397c1d25
Reviewed-on: https://code.wireshark.org/review/6483
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 49 |
1 files changed, 5 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index baae9f9743..7c50a8a63d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,51 +84,12 @@ endif() #Defines CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_DATADIR, etc ... include(CMakeInstallDirs) -# set(PROJECT_MAJOR_VERSION 1) -# set(PROJECT_MINOR_VERSION 9) -# set(PROJECT_PATCH_VERSION 0) -# set(PROJECT_VERSION_EXTENSION "-rc5") -# If not set, copy over Wireshark version from configure.ac -if(NOT PROJECT_MAJOR_VERSION) - file(STRINGS - ${CMAKE_SOURCE_DIR}/configure.ac - PROJECT_MAJOR_VERSION_TMP - REGEX "^m4_define\\(\\[?version_major\\]?, *\\[?[0-9]+\\]?\\)" - ) - file(STRINGS - ${CMAKE_SOURCE_DIR}/configure.ac - PROJECT_MINOR_VERSION_TMP - REGEX "^m4_define\\(\\[?version_minor\\]?, *\\[?[0-9]+\\]?\\)" - ) - file(STRINGS - ${CMAKE_SOURCE_DIR}/configure.ac - PROJECT_PATCH_VERSION_TMP - REGEX "^m4_define\\(\\[?version_micro\\]?, *\\[?[0-9]+\\]?\\)" - ) - # XXX pull VERSION_EXTENSION out of configure.ac ? - - string(REGEX REPLACE "m4_define\\(\\[?version_major\\]?, *\\[?([0-9]+)\\]?\\)" - "\\1" - PROJECT_MAJOR_VERSION - ${PROJECT_MAJOR_VERSION_TMP} - ) - string(REGEX REPLACE "m4_define\\(\\[?version_minor\\]?, *\\[?([0-9]+)\\]?\\)" - "\\1" - PROJECT_MINOR_VERSION - ${PROJECT_MINOR_VERSION_TMP} - ) - string(REGEX REPLACE "m4_define\\(\\[?version_micro\\]?, *\\[?([0-9]+)\\]?\\)" - "\\1" - PROJECT_PATCH_VERSION - ${PROJECT_PATCH_VERSION_TMP} - ) -endif() +set(PROJECT_MAJOR_VERSION 1) +set(PROJECT_MINOR_VERSION 99) +set(PROJECT_PATCH_VERSION 2) +set(PROJECT_VERSION_EXTENSION "") -if(PROJECT_VERSION_EXTENSION) - set(PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}) -else() - set(PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}) -endif() +set(PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}) message(STATUS "V: ${PROJECT_VERSION}, MaV: ${PROJECT_MAJOR_VERSION}, MiV: ${PROJECT_MINOR_VERSION}, PL: ${PROJECT_PATCH_VERSION}, EV: ${PROJECT_VERSION_EXTENSION}.") |