mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-27 03:36:39 +00:00
Cmake build: Needed variable for creation of debian package
The variable CPACK_DEBIAN_PACKAGE_RELEASE has to be in the form
of "^[A-Za-z0-9.+~]+$". We will use the abbreviated commit revision for now.
Without this change cmake 3.10 emits error.
(cherry picked from commit 847c68960a
)
This commit is contained in:
parent
6d11663090
commit
10002fe436
@ -357,12 +357,14 @@ 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_PATCH_VERSION})
|
set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
|
||||||
|
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 and 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 LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
|
WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$")
|
if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$")
|
||||||
|
set(LYX_PACKAGE_RELEASE ${CMAKE_MATCH_2})
|
||||||
# We will add offset of 40000 to get appropriate value to
|
# We will add offset of 40000 to get appropriate value to
|
||||||
# previous svn.
|
# previous svn.
|
||||||
# We use this value than also to set the package-patch-value
|
# We use this value than also to set the package-patch-value
|
||||||
|
@ -128,6 +128,7 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${LYX_PROJECT}-${LYX_INSTALL_SUFFIX}")
|
|||||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.6)")
|
set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.6)")
|
||||||
|
|
||||||
# use dpkg-shlibdeps to generate additional info for package dependency list.
|
# use dpkg-shlibdeps to generate additional info for package dependency list.
|
||||||
|
set(CPACK_DEBIAN_PACKAGE_RELEASE ${LYX_PACKAGE_RELEASE})
|
||||||
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
|
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
|
||||||
set(CPACK_DEBIAN_PACKAGE_DEBUG ON)
|
set(CPACK_DEBIAN_PACKAGE_DEBUG ON)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user