[ismrmrd] 166/281: Merge remote-tracking branch 'origin/development' into hx_development

[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 36a624772380a4a38daba62ab08b150a3d1c189c
Merge: c3fe968 57f173c
Author: hxue <hui.xue at nih.gov>
Date:   Tue Aug 13 09:07:32 2013 -0400

    Merge remote-tracking branch 'origin/development' into hx_development

 CMakeLists.txt                                |   3 +-
 LICENSE                                       |  29 +
 README.html                                   |  73 ++-
 bindings/CMakeLists.txt                       |  17 +-
 bindings/java/CMakeLists.txt                  |  11 +-
 bindings/java/cfg.jxb                         |  10 +
 bindings/java/ismrmrd_java.i                  |  31 +
 bindings/java/{make_jar.sh => make_jar.sh.in} |   2 +-
 bindings/python/CMakeLists.txt                |   4 +-
 bindings/python/ismrmrd_python.i              | 822 ++++++--------------------
 cmake/FindNumPy.cmake                         | 101 ++++
 cmake/FindXSD.cmake                           |  72 +--
 doc/README.rst                                |  14 +-
 examples/c++/CMakeLists.txt                   |   4 +
 examples/c++/publication_recon_dataset.cpp    | 206 +++++++
 schema/ismrmrd.xsd                            | 199 +++----
 16 files changed, 759 insertions(+), 839 deletions(-)

diff --cc bindings/python/CMakeLists.txt
index c74310d,d2c962a..03da70f
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@@ -1,14 -1,10 +1,14 @@@
  include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
- include_directories(${PYTHON_INCLUDE_PATH} ${PYTHON_NUMPY_INCLUDE_DIR})
+ include_directories(${PYTHON_INCLUDE_PATH} ${NUMPY_INCLUDE_DIRS})
  include_directories(${HDF5_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}/cpp ${Boost_INCLUDE_DIR})
  
 +if ( WIN32 )
 +    add_definitions(-Dismrmrd_EXPORTS)
 +endif ( WIN32 )
 +
  set_source_files_properties(ismrmrd_python.i PROPERTIES CPLUSPLUS ON)
  
- swig_add_module(ismrmrd python ismrmrd_python.i ../../ismrmrd_hdf5.cpp)
+ swig_add_module(ismrmrd python ismrmrd_python.i ${CMAKE_SOURCE_DIR}/ismrmrd_hdf5.cpp)
  swig_link_libraries(ismrmrd ${HDF5_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
  
  install(TARGETS ${SWIG_MODULE_ismrmrd_REAL_NAME} DESTINATION lib)

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