diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-09 23:55:04 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-08-15 12:02:36 -0500 |
| commit | c70859039d60db53a1966f3b1781defd032a4062 (patch) | |
| tree | 15c0052846b11bbbc2d8f6412d399510c1415f3b /base/symkey | |
| parent | a513ee42025af8bba22e6efb3e2fe268076fbd28 (diff) | |
| download | pki-c70859039d60db53a1966f3b1781defd032a4062.tar.gz pki-c70859039d60db53a1966f3b1781defd032a4062.tar.xz pki-c70859039d60db53a1966f3b1781defd032a4062.zip | |
Updated the remaining build scripts.
The remaining build scripts have been updated to automatically
find the source codes.
Ticket #62
Diffstat (limited to 'base/symkey')
| -rw-r--r-- | base/symkey/src/CMakeLists.txt | 52 | ||||
| -rw-r--r-- | base/symkey/src/com/netscape/symkey/CMakeLists.txt | 2 |
2 files changed, 43 insertions, 11 deletions
diff --git a/base/symkey/src/CMakeLists.txt b/base/symkey/src/CMakeLists.txt index 599a7cb5a..b4d190602 100644 --- a/base/symkey/src/CMakeLists.txt +++ b/base/symkey/src/CMakeLists.txt @@ -8,17 +8,49 @@ find_file(JSS_JAR /usr/share/java ) -set(symkey_java_SRCS - com/netscape/symkey/SessionKey.java +# build symkey +javac(symkey-classes + SOURCES + com/netscape/symkey/*.java + CLASSPATH + ${JSS_JAR} + OUTPUT_DIR + ${CMAKE_BINARY_DIR}/classes ) -set(CMAKE_JNI_TARGET TRUE) -set(CMAKE_JAVA_INCLUDE_PATH ${JSS_JAR}) -set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) +jar(symkey-jar + CREATE + ${CMAKE_BINARY_DIR}/dist/symkey-${APPLICATION_VERSION}.jar + INPUT_DIR + ${CMAKE_BINARY_DIR}/classes + FILES + com/netscape/symkey/*.class + DEPENDS + symkey-classes +) + +link(symkey + SOURCE + ${CMAKE_BINARY_DIR}/dist/symkey.jar + DEST + symkey-${APPLICATION_VERSION}.jar + DEPENDS + symkey-jar +) -add_jar(symkey ${symkey_java_SRCS}) -install_jar(symkey ${LIB_INSTALL_DIR}/symkey) -install_jni_symlink(symkey ${JAVA_LIB_INSTALL_DIR}) +install( + FILES + ${CMAKE_BINARY_DIR}/dist/symkey.jar + ${CMAKE_BINARY_DIR}/dist/symkey-${APPLICATION_VERSION}.jar + DESTINATION + ${LIB_INSTALL_DIR}/symkey +) + +install( + FILES + ${CMAKE_BINARY_DIR}/dist/symkey.jar + DESTINATION + ${JAVA_LIB_INSTALL_DIR} +) -set(SYMKEY_JAVA_OBJECT_DIR ${symkey_CLASS_DIR} PARENT_SCOPE) -set(SYMKEY_JAR ${symkey_JAR_FILE} CACHE INTERNAL "symkey jar file") +set(SYMKEY_JAR ${CMAKE_BINARY_DIR}/dist/symkey.jar CACHE INTERNAL "symkey jar file") diff --git a/base/symkey/src/com/netscape/symkey/CMakeLists.txt b/base/symkey/src/com/netscape/symkey/CMakeLists.txt index 47d40a3f1..683d86dd1 100644 --- a/base/symkey/src/com/netscape/symkey/CMakeLists.txt +++ b/base/symkey/src/com/netscape/symkey/CMakeLists.txt @@ -41,7 +41,7 @@ add_custom_command( ${symkey_library_HDRS} COMMAND ${JAVA_HEADER} - -classpath ${SYMKEY_JAVA_OBJECT_DIR}:${JAVA_LIB_INSTALL_DIR}/jss4.jar + -classpath ${CMAKE_BINARY_DIR}/classes:${JAVA_LIB_INSTALL_DIR}/jss4.jar -jni -d ${CMAKE_CURRENT_BINARY_DIR} com.netscape.symkey.SessionKey ) |