From 10002fe4369c71ad487d51052277af966b20660c Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 7 Oct 2017 10:47:17 +0200 Subject: [PATCH] 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 847c68960a8227c344ec6c0d66034d012bb9de5c) --- CMakeLists.txt | 6 ++++-- development/cmake/LyxPackaging.cmake | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 81adb1ff23..ba5b761c51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -357,12 +357,14 @@ endforeach(_c_l) FIND_PROGRAM(LYX_GITVERSION git) #message(STATUS "gitversion = ${LYX_GITVERSION}") set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION}) +set(LYX_PACKAGE_RELEASE "1") if(LYX_GITVERSION) if (LYX_LOCALVERSIONING) # Find the revision number and for later use 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) - if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$") + 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]+\)\\-\(.*\)$") + set(LYX_PACKAGE_RELEASE ${CMAKE_MATCH_2}) # 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 diff --git a/development/cmake/LyxPackaging.cmake b/development/cmake/LyxPackaging.cmake index 48cf0e96dd..76ee67928d 100644 --- a/development/cmake/LyxPackaging.cmake +++ b/development/cmake/LyxPackaging.cmake @@ -128,6 +128,7 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${LYX_PROJECT}-${LYX_INSTALL_SUFFIX}") set(CPACK_DEBIAN_PACKAGE_DEPENDS "python (>= 2.6)") # 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_DEBUG ON) -- 2.39.5