diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-14 22:23:31 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-14 22:23:31 +0000 |
| commit | ee70d6866360c28335fb2ea61a3e7c3d1c341ae9 (patch) | |
| tree | 63f1da7ff2caeafc2cbd3414225316231eec6c9b /pki/base/console | |
| parent | bcc2940ff4068f6f2f19d63b7e935d31d046cf10 (diff) | |
| download | pki-ee70d6866360c28335fb2ea61a3e7c3d1c341ae9.tar.gz pki-ee70d6866360c28335fb2ea61a3e7c3d1c341ae9.tar.xz pki-ee70d6866360c28335fb2ea61a3e7c3d1c341ae9.zip | |
Bugzilla Bug #586073 - Add new 'mod_revocator' runtime dependency to RA and TPS
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1624 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/console')
| -rw-r--r-- | pki/base/console/src/CMakeLists.txt | 56 |
1 files changed, 40 insertions, 16 deletions
diff --git a/pki/base/console/src/CMakeLists.txt b/pki/base/console/src/CMakeLists.txt index ff17efc0f..076f18078 100644 --- a/pki/base/console/src/CMakeLists.txt +++ b/pki/base/console/src/CMakeLists.txt @@ -1,24 +1,27 @@ -project(console_java Java) +project(pki_console_java Java) -find_file(JSS_JAR +# '/usr/share/java/pki' jars +find_file(NSUTIL_JAR NAMES - jss4.jar + nsutil.jar PATHS /usr/lib/java - /usr/share/java + /usr/share/java/pki ) -find_file(LDAPJDK_JAR + +# '/usr/share/java' jars +find_file(BASE_JAR NAMES - ldapjdk.jar + idm-console-base.jar PATHS /usr/lib/java /usr/share/java ) -find_file(BASE_JAR +find_file(LDAPJDK_JAR NAMES - idm-console-base.jar + ldapjdk.jar PATHS /usr/lib/java /usr/share/java @@ -56,7 +59,19 @@ find_file(NMCLF_EN_JAR /usr/share/java ) -set(console_java_SRCS + +# '/usr/lib/java' jars +find_file(JSS_JAR + NAMES + jss4.jar + PATHS + /usr/lib/java + /usr/share/java +) + + +# identify java sources +set(pki_console_java_SRCS com/netscape/certsrv/common/TaskId.java com/netscape/certsrv/common/DestDef.java com/netscape/certsrv/common/NameValuePairs.java @@ -578,13 +593,22 @@ set(console_java_SRCS com/netscape/admin/certsrv/IUIMapper.java ) + +# set classpath set(CMAKE_JAVA_INCLUDE_PATH - ${JSS_JAR} ${LDAPJDK_JAR} ${NSUTIL_JAR} - ${BASE_JAR} ${MMC_JAR} ${MMC_EN_JAR} - ${NMCLF_JAR} ${NMCLF_EN_JAR}) + ${BASE_JAR} ${LDAPJDK_JAR} ${MMC_JAR} + ${MMC_EN_JAR} ${NMCLF_JAR} ${NMCLF_EN_JAR} + ${NSUTIL_JAR} + ${JSS_JAR}) + + +# set version set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) -add_jar(console ${console_java_SRCS}) -add_dependencies(console nsutil) -install_jar(console ${JAVA_JAR_INSTALL_DIR}/pki) -set(CONSOLE_JAR ${console_JAR_FILE} CACHE INTERNAL "console jar file") + +# build pki-console.jar +add_jar(pki-console ${pki_console_java_SRCS}) +add_dependencies(pki-console nsutil) +install_jar(pki-console ${JAVA_JAR_INSTALL_DIR}) +set(PKI_CONSOLE_JAR ${pki_console_JAR_FILE} CACHE INTERNAL "pki-console jar file") + |