anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kornel Benko 2020-12-29 20:27:19 +01:00
parent 0afa322860
commit c07278a45c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/cmake/modules/LyXMacros.cmake
View File

@ -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)