summaryrefslogtreecommitdiffstats
path: root/base/tps/src
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-10-05 22:58:16 +0200
committerMatthew Harmsen <mharmsen@redhat.com>2016-10-10 16:38:07 -0600
commitd47733f8f9b01b04ef1970754133befa25955c9d (patch)
treea8fdf64f409aee9d3bf662a0a2a03dfce55743a6 /base/tps/src
parentb939fc39ed98e2d3f5cf527c60268c2c6de09811 (diff)
downloadpki-d47733f8f9b01b04ef1970754133befa25955c9d.tar.gz
pki-d47733f8f9b01b04ef1970754133befa25955c9d.tar.xz
pki-d47733f8f9b01b04ef1970754133befa25955c9d.zip
Removed duplicate classes.
The CMake scripts have been modified to store compiled Java classes in separate folders for each JAR files to avoid duplicates. https://fedorahosted.org/pki/ticket/2505
Diffstat (limited to 'base/tps/src')
-rw-r--r--base/tps/src/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/tps/src/CMakeLists.txt b/base/tps/src/CMakeLists.txt
index 5e51f609c..f517a63c4 100644
--- a/base/tps/src/CMakeLists.txt
+++ b/base/tps/src/CMakeLists.txt
@@ -121,7 +121,7 @@ javac(pki-tps-classes
${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR}
${PKI_CERTSRV_JAR} ${PKI_CMS_JAR} ${PKI_CMSCORE_JAR}
OUTPUT_DIR
- ${CMAKE_BINARY_DIR}/classes
+ ${CMAKE_CURRENT_BINARY_DIR}/classes
DEPENDS
symkey-jar pki-nsutil-jar pki-cmsutil-jar pki-certsrv-jar pki-cms-jar pki-cmscore-jar
)
@@ -139,7 +139,7 @@ jar(pki-tps-jar
PARAMS
${CMAKE_CURRENT_BINARY_DIR}/pki-tps.mf
INPUT_DIR
- ${CMAKE_BINARY_DIR}/classes
+ ${CMAKE_CURRENT_BINARY_DIR}/classes
FILES
org/dogtagpki/server/tps/*.class
DEPENDS