]> git.lyx.org Git - lyx.git/commitdiff
Amend 137fd291c2a for cmake (change of AC_INIT params)
authorKornel Benko <kornel@lyx.org>
Thu, 27 Jul 2023 05:10:32 +0000 (07:10 +0200)
committerKornel Benko <kornel@lyx.org>
Thu, 27 Jul 2023 05:10:32 +0000 (07:10 +0200)
development/cmake/modules/LyXMacros.cmake

index e221af1e36419f550f5ab33f839ed5ca080fff3c..a3a93b99b457325f52227bdcdaba8fdc0b2c3598 100644 (file)
@@ -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})