[ismrmrd] 195/281: revert to Java .jar depending on native Java library.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit 1e307c1f42d6ad11155b5c3b306a531f9e6f95c2
Author: Joseph Naegele <joseph.naegele at gmail.com>
Date:   Fri Dec 6 15:52:48 2013 -0500

    revert to Java .jar depending on native Java library.
    
    the Swig Java library interface to ISMRMRD must be built
    before making the .jar containing the full Java library.
---
 bindings/java/CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 8778a55..5eb54b9 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -17,15 +17,16 @@ swig_link_libraries(jismrmrd ${HDF5_LIBRARIES} ${Boost_LIBRARIES})
 configure_file(make_jar.sh.in make_jar.sh @ONLY)
 
 set(JAVADOC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/doc")
-set(JAVA_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/ismrmrd.jar" ${JAVADOC_OUTPTU})
+set(JAVA_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/ismrmrd.jar" ${JAVADOC_OUTPUT})
 
 ## TODO: not use a shell script... it breaks 'make'
 add_custom_command(
     OUTPUT ${JAVA_OUTPUTS}
-    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/make_jar.sh"
+    DEPENDS jismrmrd "${CMAKE_CURRENT_BINARY_DIR}/make_jar.sh"
     VERBATIM
     COMMENT "Compiling java files, building jar, generating API docs"
-    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/JNILibLoader.java
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/JNILibLoader.java
                ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/
     COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/org/ismrm/ismrmrd/xmlhdr
     COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/XMLString.java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git