summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/ca/src/CMakeLists.txt14
-rw-r--r--base/common/src/CMakeLists.txt68
-rw-r--r--base/common/test/CMakeLists.txt10
-rw-r--r--base/console/src/CMakeLists.txt12
-rw-r--r--base/java-tools/src/CMakeLists.txt14
-rw-r--r--base/javadoc/CMakeLists.txt2
-rw-r--r--base/kra/src/CMakeLists.txt14
-rw-r--r--base/ocsp/src/CMakeLists.txt14
-rw-r--r--base/silent/src/CMakeLists.txt14
-rw-r--r--base/symkey/src/CMakeLists.txt19
-rw-r--r--base/tks/src/CMakeLists.txt14
-rw-r--r--base/util/src/CMakeLists.txt26
-rw-r--r--base/util/test/CMakeLists.txt2
13 files changed, 33 insertions, 190 deletions
diff --git a/base/ca/src/CMakeLists.txt b/base/ca/src/CMakeLists.txt
index 9bfbb23a2..6aa00a754 100644
--- a/base/ca/src/CMakeLists.txt
+++ b/base/ca/src/CMakeLists.txt
@@ -43,7 +43,7 @@ javac(pki-ca-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore
+ symkey-jar pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-cmscore-jar
)
configure_file(
@@ -53,7 +53,7 @@ configure_file(
jar(pki-ca-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-ca-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-ca.jar
OPTIONS
m
PARAMS
@@ -66,19 +66,9 @@ jar(pki-ca-jar
pki-ca-classes
)
-link(pki-ca
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-ca.jar
- DEST
- pki-ca-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-ca-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-ca.jar
- ${CMAKE_BINARY_DIR}/dist/pki-ca-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/common/src/CMakeLists.txt b/base/common/src/CMakeLists.txt
index 516c7ad2d..d5caff43e 100644
--- a/base/common/src/CMakeLists.txt
+++ b/base/common/src/CMakeLists.txt
@@ -133,7 +133,7 @@ javac(pki-certsrv-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-nsutil pki-cmsutil
+ pki-nsutil-jar pki-cmsutil-jar
)
configure_file(
@@ -143,7 +143,7 @@ configure_file(
jar(pki-certsrv-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-certsrv-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar
OPTIONS
m
PARAMS
@@ -156,19 +156,9 @@ jar(pki-certsrv-jar
pki-certsrv-classes
)
-link(pki-certsrv
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar
- DEST
- pki-certsrv-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-certsrv-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-certsrv.jar
- ${CMAKE_BINARY_DIR}/dist/pki-certsrv-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -193,7 +183,7 @@ javac(pki-cms-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-nsutil pki-cmsutil pki-certsrv
+ pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar
)
configure_file(
@@ -203,7 +193,7 @@ configure_file(
jar(pki-cms-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-cms-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
OPTIONS
m
PARAMS
@@ -218,19 +208,9 @@ jar(pki-cms-jar
pki-cms-classes
)
-link(pki-cms
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-cms.jar
- DEST
- pki-cms-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-cms-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-cms.jar
- ${CMAKE_BINARY_DIR}/dist/pki-cms-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -247,7 +227,7 @@ javac(pki-tomcat-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-cms
+ pki-cms-jar
)
configure_file(
@@ -257,7 +237,7 @@ configure_file(
jar(pki-tomcat-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-tomcat-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
OPTIONS
m
PARAMS
@@ -270,19 +250,9 @@ jar(pki-tomcat-jar
pki-tomcat-classes
)
-link(pki-tomcat
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
- DEST
- pki-tomcat-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-tomcat-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-tomcat.jar
- ${CMAKE_BINARY_DIR}/dist/pki-tomcat-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -305,7 +275,7 @@ javac(pki-cmscore-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-tomcat
+ pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-tomcat-jar
)
configure_file(
@@ -315,7 +285,7 @@ configure_file(
jar(pki-cmscore-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-cmscore-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
OPTIONS
m
PARAMS
@@ -328,19 +298,9 @@ jar(pki-cmscore-jar
pki-cmscore-classes
)
-link(pki-cmscore
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
- DEST
- pki-cmscore-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-cmscore-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-cmscore.jar
- ${CMAKE_BINARY_DIR}/dist/pki-cmscore-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -356,7 +316,7 @@ configure_file(
jar(pki-cmsbundle-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
OPTIONS
m
PARAMS
@@ -368,19 +328,9 @@ jar(pki-cmsbundle-jar
pki-cmsbundle-jar
)
-link(pki-cmsbundle
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
- DEST
- pki-cmsbundle-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-cmsbundle-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-cmsbundle.jar
- ${CMAKE_BINARY_DIR}/dist/pki-cmsbundle-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/common/test/CMakeLists.txt b/base/common/test/CMakeLists.txt
index 181c7530f..d39b34f54 100644
--- a/base/common/test/CMakeLists.txt
+++ b/base/common/test/CMakeLists.txt
@@ -9,21 +9,21 @@ find_file(PKI_CERTSRV_JAR
find_file(PKI_CMS_JAR
NAMES
- pki-cms
+ pki-cms.jar
PATHS
${JAVA_JAR_INSTALL_DIR}/pki
)
find_file(PKI_CMSCORE_JAR
NAMES
- pki-cmscore
+ pki-cmscore.jar
PATHS
${JAVA_JAR_INSTALL_DIR}/pki
)
find_file(PKI_CMSBUNDLE_JAR
NAMES
- pki-cmsbundle
+ pki-cmsbundle.jar
PATHS
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -44,8 +44,8 @@ javac(pki-common-test-classes
${CMAKE_BINARY_DIR}/test/classes
DEPENDS
pki-test-classes
- pki-nsutil pki-cmsutil
- pki-certsrv pki-cms pki-cmscore pki-cmsbundle
+ pki-nsutil-jar pki-cmsutil-jar
+ pki-certsrv-jar pki-cms-jar pki-cmscore-jar pki-cmsbundle-jar
)
# create test target
diff --git a/base/console/src/CMakeLists.txt b/base/console/src/CMakeLists.txt
index f53f2ddd7..40f8843a8 100644
--- a/base/console/src/CMakeLists.txt
+++ b/base/console/src/CMakeLists.txt
@@ -106,7 +106,7 @@ configure_file(
# package console classes and resources
jar(pki-console-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-console-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-console.jar
OPTIONS
m
PARAMS
@@ -123,19 +123,9 @@ jar(pki-console-jar
pki-console-classes
)
-link(pki-console
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-console.jar
- DEST
- pki-console-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-console-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-console.jar
- ${CMAKE_BINARY_DIR}/dist/pki-console-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/java-tools/src/CMakeLists.txt b/base/java-tools/src/CMakeLists.txt
index d2169e1c2..191485667 100644
--- a/base/java-tools/src/CMakeLists.txt
+++ b/base/java-tools/src/CMakeLists.txt
@@ -94,7 +94,7 @@ javac(pki-tools-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-nsutil pki-cmsutil pki-certsrv
+ pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar
)
configure_file(
@@ -104,7 +104,7 @@ configure_file(
jar(pki-tools-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-tools-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-tools.jar
OPTIONS
m
PARAMS
@@ -117,19 +117,9 @@ jar(pki-tools-jar
pki-tools-classes
)
-link(pki-tools
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-tools.jar
- DEST
- pki-tools-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-tools-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-tools.jar
- ${CMAKE_BINARY_DIR}/dist/pki-tools-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/javadoc/CMakeLists.txt b/base/javadoc/CMakeLists.txt
index c2d4a8012..99d152c05 100644
--- a/base/javadoc/CMakeLists.txt
+++ b/base/javadoc/CMakeLists.txt
@@ -29,7 +29,7 @@ javadoc(pki-javadoc
-use
-version
DEPENDS
- pki-cmsutil pki-certsrv pki-cms pki-tools
+ pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-tools-jar
)
install(
diff --git a/base/kra/src/CMakeLists.txt b/base/kra/src/CMakeLists.txt
index 1d4f75b69..38544dd41 100644
--- a/base/kra/src/CMakeLists.txt
+++ b/base/kra/src/CMakeLists.txt
@@ -88,7 +88,7 @@ javac(pki-kra-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore
+ symkey-jar pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-cmscore-jar
)
configure_file(
@@ -98,7 +98,7 @@ configure_file(
jar(pki-kra-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-kra-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-kra.jar
OPTIONS
m
PARAMS
@@ -111,19 +111,9 @@ jar(pki-kra-jar
pki-kra-classes
)
-link(pki-kra
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-kra.jar
- DEST
- pki-kra-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-kra-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-kra.jar
- ${CMAKE_BINARY_DIR}/dist/pki-kra-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/ocsp/src/CMakeLists.txt b/base/ocsp/src/CMakeLists.txt
index 2ea6a1536..2251e9b11 100644
--- a/base/ocsp/src/CMakeLists.txt
+++ b/base/ocsp/src/CMakeLists.txt
@@ -88,7 +88,7 @@ javac(pki-ocsp-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore
+ symkey-jar pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-cmscore-jar
)
configure_file(
@@ -98,7 +98,7 @@ configure_file(
jar(pki-ocsp-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-ocsp-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-ocsp.jar
OPTIONS
m
PARAMS
@@ -111,19 +111,9 @@ jar(pki-ocsp-jar
pki-ocsp-classes
)
-link(pki-ocsp
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-ocsp.jar
- DEST
- pki-ocsp-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-ocsp-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-ocsp.jar
- ${CMAKE_BINARY_DIR}/dist/pki-ocsp-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/silent/src/CMakeLists.txt b/base/silent/src/CMakeLists.txt
index 00e1c4e46..72be415bd 100644
--- a/base/silent/src/CMakeLists.txt
+++ b/base/silent/src/CMakeLists.txt
@@ -36,7 +36,7 @@ javac(pki-silent-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- symkey pki-cmsutil pki-nsutil pki-certsrv pki-cms
+ symkey-jar pki-cmsutil-jar pki-nsutil-jar pki-certsrv-jar pki-cms-jar
)
configure_file(
@@ -46,7 +46,7 @@ configure_file(
jar(pki-silent-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-silent-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-silent.jar
OPTIONS
m
PARAMS
@@ -62,19 +62,9 @@ jar(pki-silent-jar
pki-silent-classes
)
-link(pki-silent
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-silent.jar
- DEST
- pki-silent-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-silent-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-silent.jar
- ${CMAKE_BINARY_DIR}/dist/pki-silent-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/symkey/src/CMakeLists.txt b/base/symkey/src/CMakeLists.txt
index b4d190602..149247599 100644
--- a/base/symkey/src/CMakeLists.txt
+++ b/base/symkey/src/CMakeLists.txt
@@ -20,7 +20,7 @@ javac(symkey-classes
jar(symkey-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/symkey-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/symkey.jar
INPUT_DIR
${CMAKE_BINARY_DIR}/classes
FILES
@@ -29,23 +29,6 @@ jar(symkey-jar
symkey-classes
)
-link(symkey
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/symkey.jar
- DEST
- symkey-${APPLICATION_VERSION}.jar
- DEPENDS
- symkey-jar
-)
-
-install(
- FILES
- ${CMAKE_BINARY_DIR}/dist/symkey.jar
- ${CMAKE_BINARY_DIR}/dist/symkey-${APPLICATION_VERSION}.jar
- DESTINATION
- ${LIB_INSTALL_DIR}/symkey
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/symkey.jar
diff --git a/base/tks/src/CMakeLists.txt b/base/tks/src/CMakeLists.txt
index cb901c446..522d1dc06 100644
--- a/base/tks/src/CMakeLists.txt
+++ b/base/tks/src/CMakeLists.txt
@@ -89,7 +89,7 @@ javac(pki-tks-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- symkey pki-nsutil pki-cmsutil pki-certsrv pki-cms pki-cmscore
+ symkey-jar pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-cmscore-jar
)
configure_file(
@@ -99,7 +99,7 @@ configure_file(
jar(pki-tks-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-tks-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-tks.jar
OPTIONS
m
PARAMS
@@ -112,19 +112,9 @@ jar(pki-tks-jar
pki-tks-classes
)
-link(pki-tks
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-tks.jar
- DEST
- pki-tks-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-tks-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-tks.jar
- ${CMAKE_BINARY_DIR}/dist/pki-tks-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/util/src/CMakeLists.txt b/base/util/src/CMakeLists.txt
index a39d9d828..767db7d69 100644
--- a/base/util/src/CMakeLists.txt
+++ b/base/util/src/CMakeLists.txt
@@ -64,7 +64,7 @@ configure_file(
jar(pki-nsutil-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-nsutil-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-nsutil.jar
OPTIONS
m
PARAMS
@@ -77,19 +77,9 @@ jar(pki-nsutil-jar
pki-nsutil-classes
)
-link(pki-nsutil
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-nsutil.jar
- DEST
- pki-nsutil-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-nsutil-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-nsutil.jar
- ${CMAKE_BINARY_DIR}/dist/pki-nsutil-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
@@ -107,7 +97,7 @@ javac(pki-cmsutil-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/classes
DEPENDS
- pki-nsutil
+ pki-nsutil-jar
)
configure_file(
@@ -117,7 +107,7 @@ configure_file(
jar(pki-cmsutil-jar
CREATE
- ${CMAKE_BINARY_DIR}/dist/pki-cmsutil-${APPLICATION_VERSION}.jar
+ ${CMAKE_BINARY_DIR}/dist/pki-cmsutil.jar
OPTIONS
m
PARAMS
@@ -130,19 +120,9 @@ jar(pki-cmsutil-jar
pki-cmsutil-classes
)
-link(pki-cmsutil
- SOURCE
- ${CMAKE_BINARY_DIR}/dist/pki-cmsutil.jar
- DEST
- pki-cmsutil-${APPLICATION_VERSION}.jar
- DEPENDS
- pki-cmsutil-jar
-)
-
install(
FILES
${CMAKE_BINARY_DIR}/dist/pki-cmsutil.jar
- ${CMAKE_BINARY_DIR}/dist/pki-cmsutil-${APPLICATION_VERSION}.jar
DESTINATION
${JAVA_JAR_INSTALL_DIR}/pki
)
diff --git a/base/util/test/CMakeLists.txt b/base/util/test/CMakeLists.txt
index 28aae0a14..fdb97e5a1 100644
--- a/base/util/test/CMakeLists.txt
+++ b/base/util/test/CMakeLists.txt
@@ -13,7 +13,7 @@ javac(pki-util-test-classes
OUTPUT_DIR
${CMAKE_BINARY_DIR}/test/classes
DEPENDS
- pki-test-classes pki-nsutil pki-cmsutil
+ pki-test-classes pki-nsutil-jar pki-cmsutil-jar
)
# create test target
generated by cgit (git 2.34.1) at 2024-04-23 19:10:27 +0000