diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-08 21:59:10 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-08 21:59:10 +0000 |
| commit | 0e3362ca442919102b42df6120c49cc7924bc512 (patch) | |
| tree | 187eebe272a57f477e62b09f91101a1875e37df1 /pki/base/java-tools | |
| parent | 4424a5d25c860a3b6a1f63b717891f982a6029aa (diff) | |
| download | pki-0e3362ca442919102b42df6120c49cc7924bc512.tar.gz pki-0e3362ca442919102b42df6120c49cc7924bc512.tar.xz pki-0e3362ca442919102b42df6120c49cc7924bc512.zip | |
Bugzilla Bug #643206 - New CMake based build system for Dogtag
(prevent class replication across jars)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1612 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/java-tools')
| -rw-r--r-- | pki/base/java-tools/src/CMakeLists.txt | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt index aed40fb16..8f55b2bf1 100644 --- a/pki/base/java-tools/src/CMakeLists.txt +++ b/pki/base/java-tools/src/CMakeLists.txt @@ -1,5 +1,13 @@ project(pkitools_java Java) +find_file(JSS_JAR + NAMES + jss4.jar + PATHS + /usr/lib/java + /usr/share/java +) + find_file(OSUTIL_JAR NAMES osutil.jar @@ -8,9 +16,17 @@ find_file(OSUTIL_JAR /usr/share/java ) -find_file(JSS_JAR +find_file(XALAN_JAR NAMES - jss4.jar + xalan-j2.jar + PATHS + /usr/lib/java + /usr/share/java +) + +find_file(XERCES_JAR + NAMES + xerces-j2.jar PATHS /usr/lib/java /usr/share/java @@ -40,10 +56,15 @@ set(pkitools_java_SRCS com/netscape/cmstools/PKCS10Client.java ) -set(CMAKE_JAVA_INCLUDE_PATH ${JSS_JAR} ${OSUTIL_JAR} ${NSUTIL_JAR} ${CMSUTIL_JAR} ${CMS_JAR}) +set(CMAKE_JAVA_INCLUDE_PATH + ${NSUTIL_JAR} ${CMSUTIL_JAR} + ${XALAN_JAR} ${XERCES_JAR} + ${JSS_JAR} ${OSUTIL_JAR}) + set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) -add_jar(pkitools ${netscape_java_SRCS} ${pkitools_java_SRCS}) -add_dependencies(pkitools osutil nsutil cmsutil cms) +# build pkitools +add_jar(pkitools ${pkitools_java_SRCS}) +add_dependencies(pkitools osutil nsutil cmsutil) install_jar(pkitools ${JAVA_JAR_INSTALL_DIR}) -set(CMSTOOLS_JAR ${pkitools_JAR_FILE} CACHE INTERNAL "pkitools jar file") +set(PKITOOLS_JAR ${pkitools_JAR_FILE} CACHE INTERNAL "pkitools jar file") |