From 4fb3e19aa7d6dd233fc2c9dc73495e40cdd47d13 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sun, 22 May 2011 08:38:31 +0000 Subject: [PATCH] Hold cpack-variables together git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38807 a592a061-630c-0410-9148-cb99ea01b6c8 --- CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32a2cec34b..7ddbd5c316 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,7 +208,7 @@ foreach(_c_l ${_config_lines} ) if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\)?.*$") set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1}) set(LYX_MINOR_VERSION ${CMAKE_MATCH_2}) - set(LYX_PATCH_VERSION ${CMAKE_MATCH_4}) # TODO 2.1.0svn, LYX_PATCH_VERSION == 0 + set(LYX_PATCH_VERSION ${CMAKE_MATCH_4}) set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x") set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x") set(LYX_INSTALL_SUFFIX "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}") @@ -219,17 +219,13 @@ foreach(_c_l ${_config_lines} ) endif() endforeach(_c_l) -# Find the revision number and use it as the release in rpm-package-build. -# This way we may omit the otherwise needed "--force" parameter when -# installing from that rpm package. +# Find the revision number and for later use FIND_PROGRAM(LYX_SVNVERSION svnversion) #message(STATUS "svnversion = ${LYX_SVNVERSION}") if(LYX_SVNVERSION) - # TODO revision number has nothing to do with cpack vars: split out - EXECUTE_PROCESS(COMMAND ${LYX_SVNVERSION} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND ${LYX_SVNVERSION} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) # We use this value also to set the package-patch-value - if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)") - set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1}) # TODO this is not the patch level + if(LYX_PACKAGE_RELEASE MATCHES "^\([0-9]+\)") set(LYX_REVISION_VERSION ${CMAKE_MATCH_1}) endif() else() @@ -237,7 +233,6 @@ else() endif() - if(LYX_PROGRAM_SUFFIX) set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}") else() @@ -686,7 +681,12 @@ endif() set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_description.txt") set(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/LyX_license.txt") - +# Use the revision number saved in ${LYX_PACKAGE_RELEASE} +# as the release in rpm-package-build. +# This way we maycan omit the otherwise needed "--force" parameter when +# installing from that rpm package. +set(CPACK_RPM_PACKAGE_RELEASE ${LYX_PACKAGE_RELEASE}) +set(CPACK_PACKAGE_VERSION_PATCH ${LYX_REVISION_VERSION}) # we do not have a readme or welcome data, # so we do not provide infofiles for