Author: kornel
Date: Sun May 22 10:38:31 2011
New Revision: 38807
URL: http://www.lyx.org/trac/changeset/38807
Log:
Hold cpack-variables together
Modified:
lyx-devel/trunk/CMakeLists.txt
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Sun May 22 10:18:54 2011 (r38806)
+++ lyx-devel/trunk/CMakeLists.txt Sun May 22 10:38:31 2011 (r38807)
@@ -208,7 +208,7 @@
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 @@
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 @@
endif()
-
if(LYX_PROGRAM_SUFFIX)
set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}")
else()
@@ -686,7 +681,12 @@
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
