diff options
Diffstat (limited to 'base/tks')
| -rw-r--r-- | base/tks/setup/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | base/tks/shared/conf/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | base/tks/shared/conf/CS.cfg.in | 4 | ||||
| -rw-r--r-- | base/tks/src/pki-tks.mf | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/base/tks/setup/CMakeLists.txt b/base/tks/setup/CMakeLists.txt index f5f069cdb..d2a1399e6 100644 --- a/base/tks/setup/CMakeLists.txt +++ b/base/tks/setup/CMakeLists.txt @@ -1,5 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) - install( FILES registry_instance diff --git a/base/tks/shared/conf/CMakeLists.txt b/base/tks/shared/conf/CMakeLists.txt index e3cef5915..419289d03 100644 --- a/base/tks/shared/conf/CMakeLists.txt +++ b/base/tks/shared/conf/CMakeLists.txt @@ -1,7 +1,3 @@ -set(VERSION ${APPLICATION_VERSION}) -set(MAJOR_VERSION ${APPLICATION_VERSION_MAJOR}) -set(MINOR_VERSION ${APPLICATION_VERSION_MINOR}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CS.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/CS.cfg @ONLY) install( diff --git a/base/tks/shared/conf/CS.cfg.in b/base/tks/shared/conf/CS.cfg.in index f641e026f..7f11c4b18 100644 --- a/base/tks/shared/conf/CS.cfg.in +++ b/base/tks/shared/conf/CS.cfg.in @@ -25,7 +25,7 @@ preop.securitydomain.admin_url=https://[PKI_MACHINE_NAME]:9445 preop.wizard.name=TKS Setup Wizard preop.system.name=TKS preop.product.name=CS -preop.product.version=@VERSION@ +preop.product.version=@APPLICATION_VERSION@ preop.system.fullname=Token Key Service proxy.securePort=[PKI_PROXY_SECURE_PORT] proxy.unsecurePort=[PKI_PROXY_UNSECURE_PORT] @@ -152,7 +152,7 @@ cmc.lraPopWitness.verify.allow=true cmc.revokeCert.verify=true cmc.revokeCert.sharedSecret.class=com.netscape.cms.authentication.SharedSecret cmc.sharedSecret.class=com.netscape.cms.authentication.SharedSecret -cms.version=@MAJOR_VERSION@.@MINOR_VERSION@ +cms.version=@APPLICATION_VERSION_MAJOR@.@APPLICATION_VERSION_MINOR@ dbs.ldap=internaldb dbs.newSchemaEntryAdded=true debug.append=true diff --git a/base/tks/src/pki-tks.mf b/base/tks/src/pki-tks.mf index a9f3a3e50..38d85b998 100644 --- a/base/tks/src/pki-tks.mf +++ b/base/tks/src/pki-tks.mf @@ -1,2 +1,3 @@ Name: pki-tks -Implementation-Version: ${APPLICATION_VERSION}
\ No newline at end of file +Specification-Version: ${APPLICATION_VERSION} +Implementation-Version: ${VERSION} |