From f81718c563ea12240e161a807013acd2d6eb1f2e Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Sun, 30 Sep 2012 12:21:46 -0500 Subject: Using RPM version number in CMake. The RPM spec files have been modified to pass the full RPM version number to CMake. The version number contains the product version number, release number, milestone, and platform. The CMake scritps will parse and use this version number to generate Java manifest files. The product version number will be used as the specification version and full version number will be used as the implementation version. Ticket #339 --- base/ra/doc/CMakeLists.txt | 2 -- base/ra/doc/CS.cfg.in | 2 +- base/ra/setup/CMakeLists.txt | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) (limited to 'base/ra') diff --git a/base/ra/doc/CMakeLists.txt b/base/ra/doc/CMakeLists.txt index 4cebbe1c9..419289d03 100644 --- a/base/ra/doc/CMakeLists.txt +++ b/base/ra/doc/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY) install( diff --git a/base/ra/doc/CS.cfg.in b/base/ra/doc/CS.cfg.in index 0581e3a78..702dda90b 100644 --- a/base/ra/doc/CS.cfg.in +++ b/base/ra/doc/CS.cfg.in @@ -190,7 +190,7 @@ conn.ca1.timeout=100 conn.ca1.SSLOn=true conn.ca1.keepAlive=true preop.pin=[PKI_RANDOM_NUMBER] -preop.product.version=@VERSION@ +preop.product.version=@APPLICATION_VERSION@ preop.cert._000=######################################### preop.cert._001=# Installation configuration "preop" certs parameters preop.cert._002=######################################### diff --git a/base/ra/setup/CMakeLists.txt b/base/ra/setup/CMakeLists.txt index 4f9784507..0e81ca150 100644 --- a/base/ra/setup/CMakeLists.txt +++ b/base/ra/setup/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - install( FILES pkidaemon_registry -- cgit