[ismrmrd] 92/177: merge from sf/development

[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 52737067634af8550636f31a4007eee35b97ac5d
Merge: 24bcf1d b2f81c7
Author: Hui Xue <hui.xue at nih.gov>
Date:   Thu Sep 25 11:09:40 2014 -0400

    merge from sf/development

 CMakeLists.txt                                     |    6 +-
 doc/CMakeLists.txt                                 |   10 +-
 doc/Doxyfile.in                                    | 2333 ++++++++++++++++++++
 doc/README.md                                      |  492 +++++
 doc/doxygen/CMakeLists.txt                         |    8 -
 doc/doxygen/Doxyfile.in                            | 1757 ---------------
 include/ismrmrd/dataset.h                          |   42 +-
 include/ismrmrd/ismrmrd.h                          |  274 ++-
 include/ismrmrd/meta.h                             |   23 +-
 include/ismrmrd/xml.h                              |    9 +-
 info/CMakeLists.txt                                |   18 +
 info/ismrmrd_info.cpp                              |   10 +
 info/ismrmrd_version.in                            |   10 +
 libsrc/dataset.c                                   |  634 +++---
 libsrc/ismrmrd.c                                   |  549 +++--
 libsrc/xml/.gitignore                              |    1 -
 matlab/+ismrmrd/AcquisitionHeader.m                |   66 +-
 matlab/+ismrmrd/ImageHeader.m                      |   27 +-
 utilities/CMakeLists.txt                           |   49 +-
 utilities/generate_cartesian_shepp_logan.cpp       |  208 +-
 utilities/ismrmrd_fftw.h                           |    1 +
 utilities/ismrmrd_ndarray.h                        |   91 +
 utilities/ismrmrd_phantom.cpp                      |    4 +-
 utilities/ismrmrd_phantom.h                        |   20 +-
 utilities/ismrmrd_utilities_export.h               |   21 -
 {examples/c++ => utilities}/test_recon_dataset.cpp |    0
 26 files changed, 4051 insertions(+), 2612 deletions(-)

diff --cc CMakeLists.txt
index c492baf,150a7e6..2f6892a
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -149,27 -125,17 +149,29 @@@ DESTINATIO
    share/ismrmrd/cmake
  )
  
++add_subdirectory(info)
++
  #  ---   Main Library  (end) ----
  
  # turn on testing
  enable_testing()
  
  # process subdirectories
+ add_subdirectory(doc)
  #add_subdirectory(examples/c++)
  #add_subdirectory(examples/c)
- #add_subdirectory(utilities)
+ add_subdirectory(utilities)
  #add_subdirectory(tests)
- #add_subdirectory(doc)
  #add_subdirectory(matlab)
  #add_subdirectory(bindings)
 -add_subdirectory(info)
 +
 +# Create package
 +string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
 +include(${ISMRMRD_CMAKE_DIR}/ismrmrd_cpack.cmake)
 +if(CPACK_GENERATOR)
 +  message(STATUS "Found CPack generators: ${CPACK_GENERATOR}")
 +  configure_file("${ISMRMRD_CMAKE_DIR}/cpack_options.cmake.in"
 +    ${ISMRMRD_CPACK_CFG_FILE} @ONLY)
 +  set(CPACK_PROJECT_CONFIG_FILE ${ISMRMRD_CPACK_CFG_FILE})
 +  include (CPack)
 +endif()

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