diff options
| author | asn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-10-19 17:45:52 +0000 |
|---|---|---|
| committer | asn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-10-19 17:45:52 +0000 |
| commit | 41f5f2765521b5aa2f6fe17db7c5db492d78191b (patch) | |
| tree | e093b6808c9cf6c847640c21663770db6110c798 /pki/base/osutil | |
| parent | bb43fafed79c9ec3e1f472a8144bd7b14243f295 (diff) | |
| download | pki-41f5f2765521b5aa2f6fe17db7c5db492d78191b.tar.gz pki-41f5f2765521b5aa2f6fe17db7c5db492d78191b.tar.xz pki-41f5f2765521b5aa2f6fe17db7c5db492d78191b.zip | |
cmake: Set osutil version and install it.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1418 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/osutil')
| -rw-r--r-- | pki/base/osutil/src/CMakeLists.txt | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pki/base/osutil/src/CMakeLists.txt b/pki/base/osutil/src/CMakeLists.txt index f51934dfa..660cb6d22 100644 --- a/pki/base/osutil/src/CMakeLists.txt +++ b/pki/base/osutil/src/CMakeLists.txt @@ -1,8 +1,5 @@ project(osutil_java Java) -set(OSUTIL_JAVA_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/osutil.dir/" PARENT_SCOPE) -set(OSUTIL_JAR "${CMAKE_CURRENT_BINARY_DIR}/osutil.jar" CACHE INTERNAL "osutil jar file") - set(osutil_java_SRCS com/netscape/osutil/LibC.java com/netscape/osutil/NTEventLogger.java @@ -13,11 +10,9 @@ set(osutil_java_SRCS com/netscape/osutil/UserID.java ) +set(CMAKE_JAVA_TARGET_VERSION ${OSUTIL_LIBRARY_VERSION}) add_jar(osutil ${osutil_java_SRCS}) +install_jar(osutil ${JAVA_LIB_INSTALL_DIR}) -install( - FILES - ${OSUTIL_JAR} - DESTINATION - ${JAVA_LIB_INSTALL_DIR} -) +set(OSUTIL_JAVA_OBJECT_DIR ${osutil_CLASS_DIR} PARENT_SCOPE) +set(OSUTIL_JAR ${osutil_JAR_FILE} CACHE INTERNAL "osutil jar file") |