[LyX/master] Amend 137fd291c2a for cmake (change of AC_INIT params)

Kornel Benko kornel at lyx.org
Thu Jul 27 03:57:41 UTC 2023


commit bbe84fbee5da7f97cdd637e7fd7aec220d175080
Author: Kornel Benko <kornel at lyx.org>
Date:   Thu Jul 27 07:10:32 2023 +0200

    Amend 137fd291c2a for cmake (change of AC_INIT params)
---
 development/cmake/modules/LyXMacros.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index e221af1..a3a93b9 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})


More information about the lyx-cvs mailing list