commit dccbf55b638b1535c458c9ae3a0c57a1c87abd40
Author: Kornel Benko <[email protected]>
Date: Wed Jan 28 10:37:25 2026 +0100
Cmake build: Handle AC_INIT with undefined build type
(cherry picked from commit 5e67a06044e2da60180229cbb154f8216509ab86)
---
development/cmake/modules/LyXMacros.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/development/cmake/modules/LyXMacros.cmake
b/development/cmake/modules/LyXMacros.cmake
index 3a5f81530a..2f14552358 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})
@@ -459,7 +459,7 @@ function(determineversionandbuildtype configfile package
version dirs date build
set(${buildtype} "development" PARENT_SCOPE)
elseif(LYX_BUILD_TYPE MATCHES "^\(alpha|beta|rc|pre\)[0-9]*$")
set(${buildtype} "prerelease" PARENT_SCOPE)
- elseif(LYX_BUILD_TYPE MATCHES "^$")
+ elseif("${LYX_BUILD_TYPE}" STREQUAL "")
set(${buildtype} "release" PARENT_SCOPE)
else()
set(${buildtype} "unknown" PARENT_SCOPE)
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
