diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-11 02:01:32 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-11 02:01:32 +0000 |
| commit | fd4fb4ad523253568fdd08f2f75726b7b4f605d9 (patch) | |
| tree | af9782cab58f37b2427d3080379115340537649a /pki/base/java-tools/src | |
| parent | f1529e8cb5c0e6802aaa459b392e269b1ff85494 (diff) | |
Bugzilla Bug #656733 - Standardize jar install location and jar names
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1719 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/java-tools/src')
| -rw-r--r-- | pki/base/java-tools/src/CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt index 54b7e0eb0..6d40bf39b 100644 --- a/pki/base/java-tools/src/CMakeLists.txt +++ b/pki/base/java-tools/src/CMakeLists.txt @@ -1,4 +1,4 @@ -project(pkitools_java Java) +project(pki-tools_java Java) find_file(JSS_JAR NAMES @@ -32,7 +32,7 @@ find_file(XERCES_JAR /usr/share/java ) -set(pkitools_java_SRCS +set(pki-tools_java_SRCS com/netscape/cmstools/PrettyPrintCrl.java com/netscape/cmstools/BtoA.java com/netscape/cmstools/PasswordCache.java @@ -57,20 +57,20 @@ set(pkitools_java_SRCS ) set(CMAKE_JAVA_INCLUDE_PATH - ${NSUTIL_JAR} ${CMSUTIL_JAR} + ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR} ${XALAN_JAR} ${XERCES_JAR} ${JSS_JAR} ${OSUTIL_JAR}) set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) -# build pkitools -add_jar(pkitools ${pkitools_java_SRCS}) -add_dependencies(pkitools osutil nsutil cmsutil) -install_jar(pkitools ${JAVA_JAR_INSTALL_DIR}) -set(PKITOOLS_JAR ${pkitools_JAR_FILE} CACHE INTERNAL "pkitools jar file") +# build pki-tools +add_jar(pki-tools ${pki-tools_java_SRCS}) +add_dependencies(pki-tools osutil pki-nsutil pki-cmsutil) +install_jar(pki-tools ${JAVA_JAR_INSTALL_DIR}/pki) +set(PKI_TOOLS_JAR ${pki-tools_JAR_FILE} CACHE INTERNAL "pki-tools jar file") create_javadoc(pki-java-tools-${APPLICATION_VERSION} - FILES ${pkitools_java_SRCS} + FILES ${pki-tools_java_SRCS} CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH} WINDOWTITLE "pki-java-tools" DOCTITLE "<h1>pki-java-tools</h1>" @@ -78,4 +78,4 @@ create_javadoc(pki-java-tools-${APPLICATION_VERSION} USE TRUE VERSION TRUE ) -add_dependencies(pki-java-tools-${APPLICATION_VERSION}_javadoc pkitools) +add_dependencies(pki-java-tools-${APPLICATION_VERSION}_javadoc pki-tools) |