From: Kornel Benko Date: Thu, 27 Jul 2023 05:10:32 +0000 (+0200) Subject: Amend 137fd291c2a for cmake (change of AC_INIT params) X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bbe84fbee5da7f97cdd637e7fd7aec220d175080;p=features.git Amend 137fd291c2a for cmake (change of AC_INIT params) --- diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index e221af1e36..a3a93b99b4 100644 --- a/development/cmake/modules/LyXMacros.cmake +++ b/development/cmake/modules/LyXMacros.cmake @@ -430,7 +430,7 @@ function(determineversionandbuildtype configfile package version dirs date build setstripped(PACKAGE_VERSION ${_PV}) setstripped(PACKAGE_BUGREPORT ${_PBU}) set(${package} ${PACKAGE_BASE} ${PACKAGE_VERSION} ${PACKAGE_BUGREPORT} PARENT_SCOPE) - if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?-?\([A-Za-z]*[0-9]*\).*$") + if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?[-~]?\([A-Za-z]+[0-9]*\).*$") set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1}) set(LYX_MINOR_VERSION ${CMAKE_MATCH_2}) set(LYX_RELEASE_LEVEL ${CMAKE_MATCH_4})