summaryrefslogtreecommitdiffstats
path: root/pki/base/java-tools
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-12-07 00:33:26 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-12-07 00:33:26 +0000
commitdce657795aff27d3a615a145acffa739cf9e676a (patch)
treeca6a35cb0e5fa929e87cb03ef9028d68f2cdae2c /pki/base/java-tools
parent3b5729e16fc37dfe12fe9964e467983335d9137c (diff)
downloadpki-dce657795aff27d3a615a145acffa739cf9e676a.tar.gz
pki-dce657795aff27d3a615a145acffa739cf9e676a.tar.xz
pki-dce657795aff27d3a615a145acffa739cf9e676a.zip
Bugzilla Bug #643206 - New CMake based build system for Dogtag
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1607 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/java-tools')
-rw-r--r--pki/base/java-tools/src/CMakeLists.txt20
1 files changed, 14 insertions, 6 deletions
diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt
index c635c757f..aed40fb16 100644
--- a/pki/base/java-tools/src/CMakeLists.txt
+++ b/pki/base/java-tools/src/CMakeLists.txt
@@ -1,4 +1,12 @@
-project(cmstools_java Java)
+project(pkitools_java Java)
+
+find_file(OSUTIL_JAR
+ NAMES
+ osutil.jar
+ PATHS
+ /usr/lib/java
+ /usr/share/java
+)
find_file(JSS_JAR
NAMES
@@ -8,7 +16,7 @@ find_file(JSS_JAR
/usr/share/java
)
-set(cmstools_java_SRCS
+set(pkitools_java_SRCS
com/netscape/cmstools/PrettyPrintCrl.java
com/netscape/cmstools/BtoA.java
com/netscape/cmstools/PasswordCache.java
@@ -35,7 +43,7 @@ set(cmstools_java_SRCS
set(CMAKE_JAVA_INCLUDE_PATH ${JSS_JAR} ${OSUTIL_JAR} ${NSUTIL_JAR} ${CMSUTIL_JAR} ${CMS_JAR})
set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
-add_jar(cmstools ${netscape_java_SRCS} ${cmstools_java_SRCS})
-add_dependencies(cmstools osutil nsutil cmsutil cms)
-install_jar(cmstools ${JAVA_JAR_INSTALL_DIR}/pki)
-set(CMSTOOLS_JAR ${cmstools_JAR_FILE} CACHE INTERNAL "cmstools jar file")
+add_jar(pkitools ${netscape_java_SRCS} ${pkitools_java_SRCS})
+add_dependencies(pkitools osutil nsutil cmsutil cms)
+install_jar(pkitools ${JAVA_JAR_INSTALL_DIR})
+set(CMSTOOLS_JAR ${pkitools_JAR_FILE} CACHE INTERNAL "pkitools jar file")