From: Kornel Benko Date: Tue, 17 Jul 2012 09:19:22 +0000 (+0200) Subject: Creating package missed the patch-version number X-Git-Tag: 2.0.5~93 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=049f955110019932dce566a15fa54ffac0a2a910;p=features.git Creating package missed the patch-version number --- diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 2189495141..9ae4beee73 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -178,9 +178,10 @@ foreach(_c_l ${_config_lines} ) setstripped(PACKAGE_BASE ${CMAKE_MATCH_1}) setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2}) setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3}) - if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\).*$") + if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\)?.*$") set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1}) set(LYX_MINOR_VERSION ${CMAKE_MATCH_2}) + set(LYX_REVISION_VERSION ${CMAKE_MATCH_4}) set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x") set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x") set(LYX_INSTALL_SUFFIX "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}") @@ -521,6 +522,7 @@ LYX_OPTION_LIST_ALL() set(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}") set(CPACK_PACKAGE_VERSION_MINOR "${LYX_MINOR_VERSION}") +set(CPACK_PACKAGE_VERSION_PATCH "${LYX_REVISION_VERSION}") FILE(STRINGS "${TOP_SRC_DIR}/development/cmake/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMARY) set(CPACK_SOURCE_GENERATOR TGZ ZIP TBZ2)