summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-10-19 17:46:21 +0000
committerasn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-10-19 17:46:21 +0000
commit3e39cc3f19a1dc8f3384cf253bd59e65fb0cda7b (patch)
treee76a23275ef40eb21465c51a1179867850241941
parentfbd12fe0574ff0e8632702e3804dd20fcaf84b1c (diff)
cmake: Set tks version and install it.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1429 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/base/tks/src/CMakeLists.txt13
1 files changed, 3 insertions, 10 deletions
diff --git a/pki/base/tks/src/CMakeLists.txt b/pki/base/tks/src/CMakeLists.txt
index 2b39f6940..8fc8a6864 100644
--- a/pki/base/tks/src/CMakeLists.txt
+++ b/pki/base/tks/src/CMakeLists.txt
@@ -1,8 +1,5 @@
project(tks_java Java)
-set(TKS_JAVA_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/tks.dir/" PARENT_SCOPE)
-set(TKS_JAR "${CMAKE_CURRENT_BINARY_DIR}/tks.jar" CACHE INTERNAL "tks jar file")
-
find_file(JSS_JAR
NAMES
jss4.jar
@@ -27,13 +24,9 @@ set(CMAKE_JAVA_INCLUDE_PATH
${JSS_JAR} ${LDAPJDK_JAR} ${NSUTIL_JAR} ${CMSUTIL_JAR}
${OSUTIL_JAR} ${SYMKEY_JAR} ${CMS_JAR} ${CMSCORE_JAR}
${CERTSRV_JAR})
+set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
add_jar(tks ${tks_java_SRCS})
add_dependencies(tks nsutil cmsutil osutil symkey cms cmscore certsrv)
-
-install(
- FILES
- ${TKS_JAR}
- DESTINATION
- ${JAVA_JAR_INSTALL_DIR}/pki
-)
+install_jar(tks ${JAVA_JAR_INSTALL_DIR}/pki)
+set(TKS_JAR ${tks_JAR_FILE} CACHE INTERNAL "tks jar file")