From: Kornel Benko <kornel@lyx.org>
Date: Tue, 29 Dec 2020 19:27:19 +0000 (+0100)
Subject: Cmake build: Syntax of AC_INIT() in configure.ac changed, adapted macro
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c07278a45c1d23d1ff8a2ed67e3cd8603680df12;p=features.git

Cmake build: Syntax of AC_INIT() in configure.ac changed, adapted macro
---

diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index 3a79424049..2d93f46976 100644
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -434,7 +434,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-z]*\).*$")
+      if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?-?\([a-z]*[0-9]*\).*$")
         set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
         set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
         set(LYX_RELEASE_LEVEL ${CMAKE_MATCH_4})
@@ -460,7 +460,7 @@ function(determineversionandbuildtype configfile package version dirs date build
   set(${date} ${LYX_DATE} PARENT_SCOPE)
   if(LYX_BUILD_TYPE MATCHES "^\(dev\)$")
     set(${buildtype} "development" PARENT_SCOPE)
-  elseif(LYX_BUILD_TYPE MATCHES "^\(alpha|beta|rc|pre\)$")
+  elseif(LYX_BUILD_TYPE MATCHES "^\(alpha|beta|rc|pre\)[0-9]*$")
     set(${buildtype} "prerelease" PARENT_SCOPE)
   elseif(LYX_BUILD_TYPE MATCHES "^$")
     set(${buildtype} "release" PARENT_SCOPE)