From dce657795aff27d3a615a145acffa739cf9e676a Mon Sep 17 00:00:00 2001
From: mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Tue, 7 Dec 2010 00:33:26 +0000
Subject: 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
---
 pki/base/java-tools/src/CMakeLists.txt | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'pki/base/java-tools/src')

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")
-- 
cgit