You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2013/02/18 13:43:40 UTC
svn commit: r1447221 - in /qpid/proton/trunk: CMakeLists.txt
proton-c/bindings/java/CMakeLists.txt proton-j/proton-api/CMakeLists.txt
proton-j/proton/CMakeLists.txt
Author: kwall
Date: Mon Feb 18 12:43:40 2013
New Revision: 1447221
URL: http://svn.apache.org/r1447221
Log:
PROTON-217: cmake build system should include install target for Java binaries
Modified:
qpid/proton/trunk/CMakeLists.txt
qpid/proton/trunk/proton-c/bindings/java/CMakeLists.txt
qpid/proton/trunk/proton-j/proton-api/CMakeLists.txt
qpid/proton/trunk/proton-j/proton/CMakeLists.txt
Modified: qpid/proton/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/CMakeLists.txt?rev=1447221&r1=1447220&r2=1447221&view=diff
==============================================================================
--- qpid/proton/trunk/CMakeLists.txt (original)
+++ qpid/proton/trunk/CMakeLists.txt Mon Feb 18 12:43:40 2013
@@ -50,6 +50,10 @@ set (SYSCONF_INSTALL_DIR etc CACHE PATH
set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory")
set (MAN_INSTALL_DIR share/man CACHE PATH "Manpage directory")
+set (JAVA_INSTALL_DIR ${SHARE_INSTALL_DIR}/java CACHE PATH "Installation directory for all JARs except those using JNI")
+set (JNI_INSTALL_DIR ${LIB_INSTALL_DIR}/java CACHE PATH "Installation directory for all JARs utilising JNI")
+set (JNI_SHARED_LIB_INSTALL_DIR ${LIB_INSTALL_DIR} CACHE PATH "Installation directory for shared objects used by JNI JARs")
+
set (PROTON_SHARE ${SHARE_INSTALL_DIR}/proton-${PN_VERSION})
# End of variables used during install
Modified: qpid/proton/trunk/proton-c/bindings/java/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/java/CMakeLists.txt?rev=1447221&r1=1447220&r2=1447221&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/java/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/java/CMakeLists.txt Mon Feb 18 12:43:40 2013
@@ -46,3 +46,7 @@ include(UseProtonJava)
rebuild_jar(proton-jni proton-jni-${PN_VERSION}.jar)
add_dependencies(proton-jni proton-api proton-swig)
+
+install_jar(proton-jni ${JNI_INSTALL_DIR})
+install(TARGETS proton-swig
+ DESTINATION ${JNI_SHARED_LIB_INSTALL_DIR})
Modified: qpid/proton/trunk/proton-j/proton-api/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/CMakeLists.txt?rev=1447221&r1=1447220&r2=1447221&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-j/proton-api/CMakeLists.txt Mon Feb 18 12:43:40 2013
@@ -22,4 +22,6 @@ set(CMAKE_JAVA_TARGET_VERSION ${PN_VERSI
file(GLOB_RECURSE SOURCES_ABS "src/main/java/*.java")
add_jar(proton-api ${SOURCES_ABS})
-rebuild_jar(proton-api proton-api-${PN_VERSION}.jar)
\ No newline at end of file
+rebuild_jar(proton-api proton-api-${PN_VERSION}.jar)
+
+install_jar(proton-api ${JAVA_INSTALL_DIR})
Modified: qpid/proton/trunk/proton-j/proton/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/CMakeLists.txt?rev=1447221&r1=1447220&r2=1447221&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-j/proton/CMakeLists.txt Mon Feb 18 12:43:40 2013
@@ -55,6 +55,9 @@ if (BOUNCYCASTLE_FOUND)
rebuild_jar(proton-j-impl proton-j-impl-${PN_VERSION}.jar)
add_dependencies(proton-j-impl proton-api)
+
+ install_jar(proton-j-impl ${JAVA_INSTALL_DIR})
else()
message("Won't build proton-j-impl because one or more Bouncycastle jars were not found. PROTON_JAR_DEPEND_DIR was: ${PROTON_JAR_DEPEND_DIR}")
endif()
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org