summaryrefslogtreecommitdiffstats
path: root/pki/base/util/src/CMakeLists.txt
diff options
context:
space:
mode:
authormharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-12-08 21:59:10 +0000
committermharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-12-08 21:59:10 +0000
commit0e3362ca442919102b42df6120c49cc7924bc512 (patch)
tree187eebe272a57f477e62b09f91101a1875e37df1 /pki/base/util/src/CMakeLists.txt
parent4424a5d25c860a3b6a1f63b717891f982a6029aa (diff)
downloadpki-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/util/src/CMakeLists.txt')
-rw-r--r--pki/base/util/src/CMakeLists.txt33
1 files changed, 24 insertions, 9 deletions
diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt
index 64fd28001..54a6821b3 100644
--- a/pki/base/util/src/CMakeLists.txt
+++ b/pki/base/util/src/CMakeLists.txt
@@ -1,16 +1,16 @@
project(cmsutil_java Java)
-find_file(LDAPJDK_JAR
+find_file(JSS_JAR
NAMES
- ldapjdk.jar
+ jss4.jar
PATHS
/usr/lib/java
/usr/share/java
)
-find_file(XERCES_JAR
+find_file(LDAPJDK_JAR
NAMES
- xerces-j2.jar
+ ldapjdk.jar
PATHS
/usr/lib/java
/usr/share/java
@@ -24,9 +24,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
@@ -321,15 +329,22 @@ set(cmsutil_java_SRCS
com/netscape/cmsutil/ocsp/ResponderID.java
)
-set(CMAKE_JAVA_INCLUDE_PATH ${LDAPJDK_JAR} ${XERCES_JAR} ${JSS_JAR} ${OSUTIL_JAR})
+set(CMAKE_JAVA_INCLUDE_PATH
+ ${LDAPJDK_JAR} ${XALAN_JAR} ${XERCES_JAR}
+ ${JSS_JAR} ${OSUTIL_JAR})
set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
+
+# build nsutil
+set(CMAKE_JAR_CLASSES_PREFIX netscape)
add_jar(nsutil ${netscape_java_SRCS})
+add_dependencies(nsutil osutil)
install_jar(nsutil ${JAVA_JAR_INSTALL_DIR}/pki)
set(NSUTIL_JAR ${nsutil_JAR_FILE} CACHE INTERNAL "nsutil jar file")
-set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
+# build cmsutil
+set(CMAKE_JAR_CLASSES_PREFIX com/netscape/cmsutil)
add_jar(cmsutil ${cmsutil_java_SRCS})
-add_dependencies(cmsutil osutil)
+add_dependencies(cmsutil osutil nsutil)
install_jar(cmsutil ${JAVA_JAR_INSTALL_DIR}/pki)
set(CMSUTIL_JAR ${cmsutil_JAR_FILE} CACHE INTERNAL "cmsutil jar file")