From: Kornel Benko Date: Wed, 15 May 2024 10:16:59 +0000 (+0200) Subject: Amend(1) 5eaa03a1, Adapt to recognise AC_INIT empty buildtype X-Git-Tag: 2.4.0~8 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8edc87b68179b6b033b9ef9e2973cd6d478e3cc3;p=lyx.git Amend(1) 5eaa03a1, Adapt to recognise AC_INIT empty buildtype --- diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index ce35e34fe9..a5c8c961c7 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})