summaryrefslogtreecommitdiffstats
path: root/pki
diff options
context:
space:
mode:
authorasn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-10-19 17:46:05 +0000
committerasn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-10-19 17:46:05 +0000
commit1d1cf5c8c6f87d0969c954a7104f98ecad0e0bc8 (patch)
treebac2b18d7ec926d6a0d1e8ee8f8340a9a0cb7004 /pki
parent9134664ae889070a62ae8910dc4357d8ae54e976 (diff)
downloadpki-1d1cf5c8c6f87d0969c954a7104f98ecad0e0bc8.tar.gz
pki-1d1cf5c8c6f87d0969c954a7104f98ecad0e0bc8.tar.xz
pki-1d1cf5c8c6f87d0969c954a7104f98ecad0e0bc8.zip
cmake: Set silent version and install it.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1423 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki')
-rw-r--r--pki/base/silent/src/CMakeLists.txt13
1 files changed, 3 insertions, 10 deletions
diff --git a/pki/base/silent/src/CMakeLists.txt b/pki/base/silent/src/CMakeLists.txt
index 9ec53e3ce..5342e77c1 100644
--- a/pki/base/silent/src/CMakeLists.txt
+++ b/pki/base/silent/src/CMakeLists.txt
@@ -1,8 +1,5 @@
project(silent_java Java)
-set(SILENT_JAVA_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmstool.dir/" PARENT_SCOPE)
-set(SILENT_JAR "${CMAKE_CURRENT_BINARY_DIR}/silent.jar" CACHE INTERNAL "silent jar file")
-
find_file(JSS_JAR
NAMES
jss4.jar
@@ -78,13 +75,9 @@ set(silent_java_SRCS
set(CMAKE_JAVA_INCLUDE_PATH
${JSS_JAR} ${LDAPJDK_JAR} ${XERCES_JAR} ${OSUTIL_JAR} ${SYMKEY_JAR}
${CERTSRV_JAR} ${CMS_JAR} ${CMSUTIL_JAR} ${NSUTIL_JAR})
+set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
add_jar(silent ${silent_java_SRCS})
add_dependencies(silent osutil symkey certsrv cms cmsutil nsutil)
-
-install(
- FILES
- ${SILENT_JAR}
- DESTINATION
- ${JAVA_JAR_INSTALL_DIR}/pki
-)
+install_jar(silent ${JAVA_JAR_INSTALL_DIR}/pki)
+set(SILENT_JAR ${silent_JAR_FILE} CACHE INTERNAL "silent jar file")