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

Cmake build: Amend 1c097e56, correctly respect the patch-level

Browse Source 
Handle also the case of creating from tar-file _and_ having 'git' installed

(cherry picked from commit cd3f11e585)
This commit is contained in:
Kornel Benko 2020-02-12 12:02:36 +01:00
parent a47dec6b4a
commit 1b0e8b36da
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -389,23 +389,31 @@ endforeach(_c_l)
FIND_PROGRAM(LYX_GITVERSION git) FIND_PROGRAM(LYX_GITVERSION git)
#message(STATUS "gitversion = ${LYX_GITVERSION}") #message(STATUS "gitversion = ${LYX_GITVERSION}")
set(LYX_REVISION_VERSION ${LYX_RELEASE_LEVEL}) set(LYX_REVISION_VERSION ${LYX_RELEASE_LEVEL})
set(LYX_PACKAGE_RELEASE "1") set(LYX_PACKAGE_RELEASE "UNDEFINED")
if(LYX_GITVERSION) if(LYX_GITVERSION)
if (LYX_LOCALVERSIONING) if (LYX_LOCALVERSIONING)
# Find the revision number 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}"
if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$") RESULT_VARIABLE tmp_GIT_RESULT
set(LYX_PACKAGE_RELEASE ${CMAKE_MATCH_2}) OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE
# We will add offset of 40000 to get appropriate value to ERROR_VARIABLE tmp_GIT_ERROR
# previous svn. OUTPUT_STRIP_TRAILING_WHITESPACE)
# We use this value than also to set the package-patch-value if (tmp_GIT_RESULT EQUAL 0)
MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)") if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$")
set(LYX_REVISION_VERSION "${LYX_RELEASE_LEVEL}-${tmp_REVISION_VERSION}git") set(LYX_PACKAGE_RELEASE ${CMAKE_MATCH_2})
set(ENABLE_DIST ON) # We will add offset of 40000 to get appropriate value to
# previous svn.
# We use this value than also to set the package-patch-value
MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)")
set(LYX_REVISION_VERSION "${LYX_RELEASE_LEVEL}-${tmp_REVISION_VERSION}git")
set(ENABLE_DIST ON)
endif()
endif() endif()
endif() endif()
else() endif()
if (LYX_PACKAGE_RELEASE MATCHES "UNDEFINED")
set(LYX_PACKAGE_RELEASE "1")
if (LYX_RELEASE_PATCH GREATER 0) if (LYX_RELEASE_PATCH GREATER 0)
set(LYX_REVISION_VERSION "${LYX_RELEASE_LEVEL}.${LYX_RELEASE_PATCH}") set(LYX_REVISION_VERSION "${LYX_RELEASE_LEVEL}.${LYX_RELEASE_PATCH}")
endif() endif()