anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-28 12:26:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake config: Respect the patch-level while creating package from tar/zip-source

Browse Source
This commit is contained in:
Kornel Benko 2020-01-17 15:27:17 +01:00
parent ef4d21b684
commit 1c097e5620
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -402,7 +402,7 @@ set(LYX_REVISION_VERSION ${LYX_RELEASE_LEVEL})
set(LYX_PACKAGE_RELEASE "1") set(LYX_PACKAGE_RELEASE "1")
if(LYX_GITVERSION) if(LYX_GITVERSION)
if (LYX_LOCALVERSIONING) if (LYX_LOCALVERSIONING)
# Find the revision number and for later use # Find the revision number for later use
EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD
WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$") if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$")
@ -415,8 +415,11 @@ if(LYX_GITVERSION)
set(ENABLE_DIST ON) set(ENABLE_DIST ON)
endif() endif()
endif() endif()
else()
if (LYX_RELEASE_PATCH GREATER 0)
set(LYX_REVISION_VERSION "${LYX_RELEASE_LEVEL}.${LYX_RELEASE_PATCH}")
endif()
endif() endif()
message(STATUS "LYX_REVISION_VERSION = ${LYX_REVISION_VERSION}")
# Set the programs (lyx, tex2lyx, etc.) suffix # Set the programs (lyx, tex2lyx, etc.) suffix
# When building an OS X bundle, we will append # When building an OS X bundle, we will append