[ismrmrd] 142/281: Resolved merge conflicts for Windows adaptions

[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 55e061bb84d946d37a7d81ca3f88d937620819b6
Merge: 50b8487 0f8a011
Author: Thomas Sangild Sorensen <sorensents at vatican.nhlbi.nih.gov>
Date:   Tue Apr 16 15:22:50 2013 -0400

    Resolved merge conflicts for Windows adaptions

 .gitignore                                 |   3 +-
 CMakeLists.txt                             |   6 +-
 bindings/CMakeLists.txt                    |  22 +
 bindings/ismrmrd.i                         |  52 ++
 bindings/java/CMakeLists.txt               |  30 ++
 bindings/java/JNILibLoader.java            |  34 ++
 bindings/java/XMLString.java               |  28 ++
 bindings/java/ismrmrd_java.i               | 749 +++++++++++++++++++++++++++++
 bindings/java/make_jar.sh                  |  13 +
 bindings/python/CMakeLists.txt             |   8 +
 bindings/python/ismrmrd_python.i           |  29 ++
 bindings/python/test.py                    |   9 +
 examples/java/ismrmrd_test.java            |  46 ++
 ismrmrd.h                                  |  28 +-
 ismrmrd_hdf5.cpp                           |   2 +-
 ismrmrd_hdf5.h                             |   2 +-
 matlab/+ismrmrd/AcquisitionHeader.m        | 124 +++--
 matlab/+ismrmrd/EncodingCounters.m         |  36 +-
 matlab/+ismrmrd/FlagBit.m                  |   8 +-
 matlab/+ismrmrd/ImageHeader.m              | 128 +++--
 matlab/+ismrmrd/XMLHeader.m                |   8 +-
 matlab/+ismrmrd/{ => old}/Acquisition.m    |   0
 matlab/+ismrmrd/{ => old}/Image.m          |   0
 matlab/+ismrmrd/{ => old}/file.m           |   0
 matlab/+ismrmrd/{ => old}/hdf5_datatypes.m |   0
 matlab/+ismrmrd/{ => old}/isInt.m          |   0
 matlab/README.txt                          |  64 ---
 27 files changed, 1232 insertions(+), 197 deletions(-)

diff --cc CMakeLists.txt
index 3b892d5,5e6d7d0..e5e7ec0
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -50,23 -47,27 +50,19 @@@ IF(WIN32
  	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/hdf5_cppddll.lib)
  	target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/hdf5_hlddll.lib)
  
--	#target_link_libraries(ismrmrd optimized ${HDF5_LIB_DIR}/zlib.lib)
--	#target_link_libraries(ismrmrd optimized ${HDF5_LIB_DIR}/szip.lib)
--	#target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/zlib.lib)
--	#target_link_libraries(ismrmrd debug ${HDF5_LIB_DIR}/szip.lib)
--
  	target_link_libraries(ismrmrd ${Boost_LIBRARIES})
  ELSE (WIN32)
  	target_link_libraries(ismrmrd ${HDF5_LIBRARIES} ${Boost_LIBRARIES})
  ENDIF(WIN32)
  
 -target_link_libraries(ismrmrd_xsd ${XERCESC_LIBRARIES})
 -
 -INSTALL(FILES ismrmrd.h ${XSDS_SOURCES} ismrmrd_hdf5.h ismrmrd_hdf5_datatypes.h ismrmrd_export.h DESTINATION include)
 -INSTALL(FILES schema/ismrmrd.xsd DESTINATION schema)
 +INSTALL(FILES ismrmrd.h ismrmrd_hdf5.h ismrmrd_hdf5_datatypes.h ismrmrd_export.h DESTINATION include)
 +INSTALL(FILES schema/ismrmrd.xsd ${XSDS_SOURCES} DESTINATION schema)
  INSTALL(FILES cmake/FindIsmrmrd.cmake cmake/FindFFTW3.cmake cmake/FindXSD.cmake cmake/FindXercesC.cmake DESTINATION cmake)
  INSTALL(TARGETS ismrmrd DESTINATION lib)
 -INSTALL(TARGETS ismrmrd_xsd DESTINATION lib)
  INSTALL(FILES ${MatlabMFiles} DESTINATION matlab/+ismrmrd)
  
 -add_subdirectory(doc)
  add_subdirectory(examples/c++)
 -add_subdirectory(tests)
  add_subdirectory(utilities)
 +add_subdirectory(tests)
 +add_subdirectory(doc)
+ add_subdirectory(bindings)

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