summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-10-19 17:46:02 +0000
committerasn <asn@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>2010-10-19 17:46:02 +0000
commit9134664ae889070a62ae8910dc4357d8ae54e976 (patch)
tree6afb5a5c29021fbb181bcaf311031926b27e5207
parent4bf69640bdd960dec8199d930a8ac34031e8d6fe (diff)
downloadpki-9134664ae889070a62ae8910dc4357d8ae54e976.tar.gz
pki-9134664ae889070a62ae8910dc4357d8ae54e976.tar.xz
pki-9134664ae889070a62ae8910dc4357d8ae54e976.zip
cmake: Set certsrv, cms and cmscore version and install it.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1422 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
-rw-r--r--pki/base/common/src/CMakeLists.txt32
1 files changed, 15 insertions, 17 deletions
diff --git a/pki/base/common/src/CMakeLists.txt b/pki/base/common/src/CMakeLists.txt
index 2891f4db4..09321e624 100644
--- a/pki/base/common/src/CMakeLists.txt
+++ b/pki/base/common/src/CMakeLists.txt
@@ -1,13 +1,5 @@
project(cmsutil_java Java)
-set(CERTSRV_JAVA_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/certsrv.dir/" PARENT_SCOPE)
-set(CMS_JAVA_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cms.dir/" PARENT_SCOPE)
-set(CMSCORE_JAVA_OBJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cmscore.dir/" PARENT_SCOPE)
-
-set(CERTSRV_JAR "${CMAKE_CURRENT_BINARY_DIR}/certsrv.jar" CACHE INTERNAL "certsrv jar file")
-set(CMS_JAR "${CMAKE_CURRENT_BINARY_DIR}/cms.jar" CACHE INTERNAL "cms jar file")
-set(CMSCORE_JAR "${CMAKE_CURRENT_BINARY_DIR}/cmscore.jar" CACHE INTERNAL "cmscore jar file")
-
find_file(LDAPJDK_JAR
NAMES
ldapjdk.jar
@@ -983,38 +975,44 @@ set(cmsbundle_RCS
UserMessages.properties
)
+# build crtsrv
set(CMAKE_JAVA_INCLUDE_PATH
${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR}
${NSUTIL_JAR} ${CMSUTIL_JAR} ${SERVLET_JAR})
+set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
add_jar(certsrv ${certsrv_java_SRCS})
add_dependencies(certsrv osutil nsutil cmsutil)
+install_jar(certsrv ${JAVA_JAR_INSTALL_DIR}/pki)
+set(CERTSRV_JAR ${certsrv_JAR_FILE} CACHE INTERNAL "certsrv jar file")
+# build cms
set(CMAKE_JAVA_INCLUDE_PATH
${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR}
${NSUTIL_JAR} ${CMSUTIL_JAR} ${SERVLET_JAR}
${VELOCITY_JAR} ${SYMKEY_JAR} ${XERCES_JAR})
+set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
add_jar(cms ${cms_java_SRCS})
add_dependencies(cms osutil nsutil cmsutil)
+install_jar(cms ${JAVA_JAR_INSTALL_DIR}/pki)
+set(CMS_JAR ${cms_JAR_FILE} CACHE INTERNAL "cms jar file")
+# build cmscore
set(CMAKE_JAVA_INCLUDE_PATH
${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR}
${NSUTIL_JAR} ${CMSUTIL_JAR} ${CERTSRV_JAR}
${SERVLET_JAR} ${XERCES_JAR})
+set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
add_jar(cmscore ${cmscore_java_SRCS})
add_dependencies(cmscore osutil nsutil cmsutil certsrv)
+install_jar(cmscore ${JAVA_JAR_INSTALL_DIR}/pki)
+set(CMSCORE_JAR ${cmscore_JAR_FILE} CACHE INTERNAL "cmscore jar file")
+# build cmsbundle
set(CMAKE_JAVA_INCLUDE_PATH
${JSS_JAR} ${LDAPJDK_JAR} ${OSUTIL_JAR}
${NSUTIL_JAR} ${CMSUTIL_JAR} ${SERVLET_JAR}
${VELOCITY_JAR} ${SYMKEY_JAR} ${XERCES_JAR})
+set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
add_jar(cmsbundle ${certserv_java_SRCS} ${cms_java_SRCS} ${cmscore_java_SRCS} ${cmsbundle_RCS})
add_dependencies(cmsbundle osutil nsutil cmsutil)
-
-install(
- FILES
- ${CERTSRV_JAR}
- ${CMS_JAR}
- ${CMSCORE_JAR}
- DESTINATION
- ${JAVA_JAR_INSTALL_DIR}/pki
-)
+install_jar(cmsbundle ${JAVA_JAR_INSTALL_DIR}/pki)