[ismrmrd] 128/281: added install target for java jar and library.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:01:05 UTC 2015


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 40d3039eb2a39fb838fad30000ec1c7585a4dc8c
Author: Joseph Naegele <joseph.naegele at gmail.com>
Date:   Wed Apr 3 16:03:32 2013 -0400

    added install target for java jar and library.
---
 bindings/java/CMakeLists.txt   | 3 +++
 bindings/python/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 77a0bae..d2a2c48 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -20,3 +20,6 @@ add_custom_command(
     COMMENT "Generating java class files and ismrmrd.jar" VERBATIM
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
+
+install(TARGETS jismrmrd DESTINATION lib)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ismrmrd.jar DESTINATION lib)
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index f9924d2..c9a5b56 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -4,7 +4,7 @@ include(${SWIG_USE_FILE})
 find_package(PythonLibs REQUIRED)
 
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${PYTHON_INCLUDE_PATH})
+include_directories(${PYTHON_INCLUDE_PATH} ${PYTHON_NUMPY_INCLUDE_DIR})
 include_directories(${HDF5_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}/cpp ${Boost_INCLUDE_DIR})
 
 set_source_files_properties(ismrmrd_python.i PROPERTIES CPLUSPLUS ON)

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



More information about the debian-science-commits mailing list