diff options
| author | asn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-10-19 17:45:57 +0000 |
|---|---|---|
| committer | asn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-10-19 17:45:57 +0000 |
| commit | 35e30a3e4e237b0398b493e1b2b2c755ddd4fa2d (patch) | |
| tree | c7a87a6dffb729ecf8fdf92aa5616e5d2bb53aae /pki/base/util/src/CMakeLists.txt | |
| parent | 7439a6194a87474913cafa909a6e1bff8b7bc6d1 (diff) | |
| download | pki-35e30a3e4e237b0398b493e1b2b2c755ddd4fa2d.tar.gz pki-35e30a3e4e237b0398b493e1b2b2c755ddd4fa2d.tar.xz pki-35e30a3e4e237b0398b493e1b2b2c755ddd4fa2d.zip | |
cmake: Set nsutil and cmsutil version and install it.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1420 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/util/src/CMakeLists.txt')
| -rw-r--r-- | pki/base/util/src/CMakeLists.txt | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt index c327cd9f0..81ac96c9a 100644 --- a/pki/base/util/src/CMakeLists.txt +++ b/pki/base/util/src/CMakeLists.txt @@ -1,11 +1,5 @@ project(cmsutil_java Java) -set(NSUTIL_JAVA_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/nsutil.dir/" PARENT_SCOPE) -set(CMSUTIL_JAVA_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmsutil.dir/" PARENT_SCOPE) - -set(NSUTIL_JAR "${CMAKE_CURRENT_BINARY_DIR}/nsutil.jar" CACHE INTERNAL "nsutil jar file") -set(CMSUTIL_JAR "${CMAKE_CURRENT_BINARY_DIR}/cmsutil.jar" CACHE INTERNAL "cmsutil jar file") - find_file(LDAPJDK_JAR NAMES ldapjdk.jar @@ -321,15 +315,13 @@ set(cmsutil_java_SRCS set(CMAKE_JAVA_INCLUDE_PATH ${LDAPJDK_JAR} ${XERCES_JAR} ${JSS_JAR} ${OSUTIL_JAR}) +set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) add_jar(nsutil ${netscape_java_SRCS}) +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}) add_jar(cmsutil ${cmsutil_java_SRCS}) add_dependencies(cmsutil osutil) - -install( - FILES - ${NSUTIL_JAR} - ${CMSUTIL_JAR} - DESTINATION - ${JAVA_JAR_INSTALL_DIR}/pki -) +install_jar(cmsutil ${JAVA_JAR_INSTALL_DIR}/pki) +set(CMSUTIL_JAR ${cmsutil_JAR_FILE} CACHE INTERNAL "cmsutil jar file") |