commit c07278a45c1d23d1ff8a2ed67e3cd8603680df12
Author: Kornel Benko <kor...@lyx.org>
Date: Tue Dec 29 20:27:19 2020 +0100
Cmake build: Syntax of AC_INIT() in configure.ac changed, adapted macro
---
development/cmake/modules/LyXMacros.cmake | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/development/cmake/modules/LyXMacros.cmake
b/development/cmake/modules/LyXMacros.cmake
index 3a79424..2d93f46 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)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
