[ismrmrd] 279/281: merge from sf

[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 c2332aeee9e60482866d80adc71eb3af8d543b58
Merge: 80819d9 a8e97fc
Author: Hui Xue <hui.xue at nih.gov>
Date:   Fri Sep 5 17:20:40 2014 -0400

    merge from sf

 CMakeLists.txt        | 71 +++++++++++++++++++++++++++++++++++++++++++--------
 matlab/CMakeLists.txt |  2 --
 xml/CMakeLists.txt    |  2 ++
 xml/ismrmrd_meta.h    |  9 +++++++
 xml/ismrmrd_xml.cpp   |  2 +-
 xml/ismrmrd_xml.h     | 25 ++++++++++++++++++
 6 files changed, 98 insertions(+), 13 deletions(-)

diff --cc CMakeLists.txt
index 51fe744,e021c56..fc552f3
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -76,16 -130,12 +130,10 @@@ find_package(XercesC REQUIRED
  set(XSDS ${ISMRMRD_SCHEMA_DIR}/ismrmrd.xsd)
  set(XSD_ARGS cxx-tree --generate-serialization)
  if ( WIN32 )
-     set(XSD_ARGS cxx-tree --generate-serialization)
-     WRAP_XSD(XSDS_SOURCES XSD_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/schema ${XSDS} OPTIONS ${XSD_ARGS})
-     
-     # This dummy is required to trigger autogeneration of ${XSDS_SOURCES}
-     add_library(dummy SHARED ${XSDS_SOURCES})
-     target_link_libraries(dummy ${XERCESC_LIBRARIES})
- else (WIN32)
-     wrap_xsd(XSDS_SOURCES XSD_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/schema ${XSDS} OPTIONS ${XSD_ARGS})
+     SET(XSD_ARGS cxx-tree --generate-serialization)
+     # --export-symbol EXPORTISMRMRDXSD --hxx-prologue-file ${CMAKE_SOURCE_DIR}/ismrmrd_xsd_export.h)
  endif (WIN32)
  
 -wrap_xsd(XSDS_SOURCES XSD_INCLUDES ${CMAKE_CURRENT_BINARY_DIR}/schema ${XSDS} OPTIONS ${XSD_ARGS})
 -
  if ( WIN32 )
      include_directories(${ISMRMRD_SCHEMA_SOURCE_DIR} ${XSD_INCLUDE_DIR}
          ${XERCESC_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${HDF5_CXX_INCLUDE_DIR}
diff --cc xml/ismrmrd_meta.h
index 5db377e,1249e90..4d4eeaf
--- a/xml/ismrmrd_meta.h
+++ b/xml/ismrmrd_meta.h
@@@ -244,6 -247,9 +247,12 @@@ namespace ISMRMR
    template void MetaContainer::append<long>(const char* name, long value);
    template void MetaContainer::append<double>(const char* name, double);
    */
++<<<<<<< HEAD
++=======
+ 
+ 
+ 
++>>>>>>> sf/development
  }
  
  #endif //ISMRMRDMETA_H

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