[ismrmrd] 21/177: Merged new XML API

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.

commit 874e774d1b1a3e99013f43d4c400b2b429872e7e
Merge: 6fce4f1 0eb8892
Author: Souheil Inati <souheil.inati at nih.gov>
Date:   Mon Aug 25 11:54:16 2014 -0400

    Merged new XML API

 CMakeLists.txt                               |     1 +
 cmake/FindIsmrmrd.cmake                      |    23 +-
 cmake/FindXSD.cmake                          |     2 +-
 matlab/CMakeLists.txt                        |     2 -
 schema/ismrmrd.xsd                           |    53 +-
 schema/ismrmrd_example_extended.xml          |   248 +
 utilities/generate_cartesian_shepp_logan.cpp |    13 +-
 xml/.gitignore                               |     1 +
 xml/CMakeLists.txt                           |    29 +
 xml/ismrmrd_meta.cpp                         |    54 +
 xml/ismrmrd_meta.h                           |   251 +
 xml/ismrmrd_xml.cpp                          |   663 ++
 xml/ismrmrd_xml.h                            |   293 +
 xml/ismrmrd_xml_export.h                     |    14 +
 xml/pugiconfig.hpp                           |    72 +
 xml/pugixml.cpp                              | 10639 +++++++++++++++++++++++++
 xml/pugixml.hpp                              |  1332 ++++
 xml/test_ismrmrd_xml.cpp                     |    52 +
 xml/test_meta.cpp                            |    33 +
 19 files changed, 13718 insertions(+), 57 deletions(-)

diff --cc CMakeLists.txt
index bf33417,8b5fec1..95eb392
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -106,10 -117,10 +106,11 @@@ install(FILES ${ISMRMRD_MODULE_DIR}/Fin
      ${ISMRMRD_MODULE_DIR}/FindNumPy.cmake
      DESTINATION ${ISMRMRD_INSTALL_MODULE_DIR})
  
 -add_subdirectory(examples/c++)
 -add_subdirectory(utilities)
 -add_subdirectory(tests)
  add_subdirectory(doc)
 +add_subdirectory(examples/c)
 +#add_subdirectory(examples/c++)
 +#add_subdirectory(utilities)
 +#add_subdirectory(tests)
  add_subdirectory(matlab)
 -add_subdirectory(bindings)
 -add_subdirectory(xml)
 +#add_subdirectory(bindings)
++add_subdirectory(xml)

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