diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-10-05 22:58:16 +0200 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2016-10-10 16:38:07 -0600 |
| commit | d47733f8f9b01b04ef1970754133befa25955c9d (patch) | |
| tree | a8fdf64f409aee9d3bf662a0a2a03dfce55743a6 /base/console/src | |
| parent | b939fc39ed98e2d3f5cf527c60268c2c6de09811 (diff) | |
| download | pki-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/console/src')
| -rw-r--r-- | base/console/src/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/base/console/src/CMakeLists.txt b/base/console/src/CMakeLists.txt index c1a86b7c4..dc5a3e3f7 100644 --- a/base/console/src/CMakeLists.txt +++ b/base/console/src/CMakeLists.txt @@ -97,13 +97,12 @@ javac(pki-console-classes SOURCES com/netscape/admin/certsrv/*.java CLASSPATH - ${CMAKE_BINARY_DIR}/classes ${BASE_JAR} ${LDAPJDK_JAR} ${MMC_JAR} ${MMC_EN_JAR} ${NMCLF_JAR} ${NMCLF_EN_JAR} ${PKI_CMSUTIL_JAR} ${PKI_NSUTIL_JAR} ${PKI_CERTSRV_JAR} ${JSS_JAR} ${COMMONS_CODEC_JAR} OUTPUT_DIR - ${CMAKE_BINARY_DIR}/classes + ${CMAKE_CURRENT_BINARY_DIR}/classes ) configure_file( @@ -120,7 +119,7 @@ jar(pki-console-jar PARAMS ${CMAKE_CURRENT_BINARY_DIR}/pki-console.mf INPUT_DIR - ${CMAKE_BINARY_DIR}/classes + ${CMAKE_CURRENT_BINARY_DIR}/classes FILES com/netscape/admin/certsrv/*.class INPUT_DIR |