From d8a290fb4adf641a4d2ed3d96a5bad1cbe863276 Mon Sep 17 00:00:00 2001
From: asn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>
Date: Tue, 19 Oct 2010 17:46:08 +0000
Subject: cmake: Set java-tools version and install it.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1424 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
---
 pki/base/java-tools/src/CMakeLists.txt | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

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

diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt
index 68da22f6c..c635c757f 100644
--- a/pki/base/java-tools/src/CMakeLists.txt
+++ b/pki/base/java-tools/src/CMakeLists.txt
@@ -1,8 +1,5 @@
 project(cmstools_java Java)
 
-set(CMSTOOLS_JAVA_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmstool.dir/" PARENT_SCOPE)
-set(CMSTOOLS_JAR "${CMAKE_CURRENT_BINARY_DIR}/cmstools.jar" CACHE INTERNAL "cmstools jar file")
-
 find_file(JSS_JAR
     NAMES
         jss4.jar
@@ -36,13 +33,9 @@ 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(
-    FILES
-        ${CMSTOOLS_JAR}
-    DESTINATION
-        ${JAVA_JAR_INSTALL_DIR}/pki
-)
+install_jar(cmstools ${JAVA_JAR_INSTALL_DIR}/pki)
+set(CMSTOOLS_JAR ${cmstools_JAR_FILE} CACHE INTERNAL "cmstools jar file")
-- 
cgit