Commit cae5506e authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.4.0

parent 8a306878
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@
*.so
build/
.DS_Store

.idea/
.project
.cproject
# autogenerated
cmake/cpack_options.cmake
+25 −7
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ if (WIN32)
    add_definitions(-D__func__=__FUNCTION__)
else ()
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11")
endif ()

#  ---   VERSIONING  (begin) ----
@@ -63,12 +63,12 @@ endif ()
#in the utility libraries, that don't affect the data format itself.
# For more information see http://semver.org/
set(ISMRMRD_VERSION_MAJOR 1)
set(ISMRMRD_VERSION_MINOR 3)
set(ISMRMRD_VERSION_PATCH 3)
set(ISMRMRD_VERSION_MINOR 4)
set(ISMRMRD_VERSION_PATCH 0)
set(ISMRMRD_VERSION_STRING ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR}.${ISMRMRD_VERSION_PATCH})
set(ISMRMRD_SOVERSION ${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR})

set(ISMRMRD_XML_SCHEMA_SHA1 "9b899c6ad806bc2388c70461d6e5affe5cc6d750")
set(ISMRMRD_XML_SCHEMA_SHA1 "275129288d0c5ec39ee11bf8f78f952ae1dcec76")

#Remove line breaks and white space that does not change the meaning of the schema
file(STRINGS ${CMAKE_SOURCE_DIR}/schema/ismrmrd.xsd SCHEMA_STRINGS) #Read all strings from file
@@ -106,13 +106,15 @@ endif()


# Find HDF5 for dataset support
find_package(HDF5 1.8 COMPONENTS C)
find_package(HDF5 COMPONENTS C)

if (HDF5_FOUND)
    set (ISMRMRD_DATASET_SUPPORT true)
    set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
    set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
    set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
    set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
    add_definitions(${HDF5_DEFINITIONS})
	include_directories(${HDF5_INCLUDE_DIRS})
else ()
    set (ISMRMRD_DATASET_SUPPORT false)
    message (WARNING "HDF5 not found. Dataset and file support unavailable!")
@@ -164,6 +166,8 @@ set(ISMRMRD_TARGET_SOURCES
  libsrc/ismrmrd.cpp
  libsrc/xml.cpp
  libsrc/meta.cpp
  libsrc/waveform.cpp
  libsrc/waveform.c
  ${ISMRMRD_DATASET_SOURCES}
)

@@ -196,7 +200,7 @@ set_target_properties(ismrmrd PROPERTIES
)
target_link_libraries(ismrmrd ${ISMRMRD_TARGET_LINK_LIBS})
list(APPEND ISMRMRD_LIBRARIES ismrmrd) # Add to list of libraries to be found
list(APPEND ISMRMRD_LIBRARY_DIRS ${CMAKE_BINARY_DIR} ) # Add to list of directories to find libaries
list(APPEND ISMRMRD_LIBRARY_DIRS ${CMAKE_BINARY_DIR} ) # Add to list of directories to find libraries

# install the main library
install(TARGETS ismrmrd EXPORT ISMRMRDTargets
@@ -258,6 +262,11 @@ configure_file(cmake/ISMRMRDConfig.cmake.in
set(CONFIG_ISMRMRD_SCHEMA_DIR   ${CMAKE_INSTALL_PREFIX}/share/ismrmrd/schema)
set(CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include)
set(CONFIG_ISMRMRD_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/lib)
if (ISMRMRD_DATASET_SUPPORT)
  list(APPEND CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS})
  list(APPEND CONFIG_ISMRMRD_LIBRARY_DIRS ${HDF5_LIBRARY_DIRS})
  list(APPEND ISMRMRD_LIBRARIES ${HDF5_LIBRARIES})
endif ()
configure_file(cmake/ISMRMRDConfig.cmake.in
  "${CMAKE_CURRENT_BINARY_DIR}/InstallFiles/ISMRMRDConfig.cmake"
  @ONLY
@@ -274,6 +283,15 @@ install(
    Devel
)

install(
  FILES
    cmake/FindFFTW3.cmake
  DESTINATION
    ${ConfigPackageLocation}
  COMPONENT
    Devel
)
  
# Create package
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
include(${ISMRMRD_CMAKE_DIR}/ismrmrd_cpack.cmake)
+3 −3
Original line number Diff line number Diff line
@@ -78,14 +78,14 @@ if (WIN32)

      string(TOUPPER ${_lib} _LIB)

      find_library(${_LIB}_LIBRARY lib${_lib}-3
      find_library(${_LIB}_LIBRARY NAMES lib${_lib}-3 lib${_lib}
        HINTS $ENV{FFTW3_ROOT_DIR} PATH_SUFFIXES lib)
      mark_as_advanced(${_LIB}_LIBRARY)
      list(APPEND FFTW3_LIBRARIES ${${_LIB}_LIBRARY})
      list(APPEND _check_list ${_LIB}_LIBRARY)
    endforeach()

    message("FFTW3 WINDOWS libraries: " ${FFTW3_LIBRARIES})
    message(STATUS "FFTW3 WINDOWS libraries: " ${FFTW3_LIBRARIES})

else ()
    foreach(_lib ${_libraries})
@@ -99,7 +99,7 @@ else ()
      list(APPEND _check_list ${_LIB}_LIBRARY)
    endforeach()

    message("FFTW3 UNIX libraries: " ${FFTW3_LIBRARIES})
    message(STATUS "FFTW3 UNIX libraries: " ${FFTW3_LIBRARIES})
endif ()

# Search for the header file.
+6 −6
Original line number Diff line number Diff line
@@ -14,16 +14,16 @@ set(ISMRMRD_VERSION_MINOR "@ISMRMRD_VERSION_MINOR@")
set(ISMRMRD_VERSION_PATCH "@ISMRMRD_VERSION_PATCH@")

#   ISMRMRD_SCHEMA_DIR   - where to find ismrmrd.xsd 
set(ISMRMRD_SCHEMA_DIR   @CONFIG_ISMRMRD_SCHEMA_DIR@)
set(ISMRMRD_SCHEMA_DIR   "@CONFIG_ISMRMRD_SCHEMA_DIR@")
#   ISMRMRD_INCLUDE_DIR  - where to find ismrmrd.h, etc.
set(ISMRMRD_INCLUDE_DIRS @CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS@)
set(ISMRMRD_INCLUDE_DIRS "@CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS@")
#   ISMRMRD_LIBRARY_DIRS - where to search for libraries
set(ISMRMRD_LIBRARY_DIRS @CONFIG_ISMRMRD_LIBRARY_DIRS@)
set(ISMRMRD_LIBRARY_DIRS "@CONFIG_ISMRMRD_LIBRARY_DIRS@")
#   ISMRMRD_LIBRARIES    - i.e. ismrmrd
set(ISMRMRD_LIBRARIES    @ISMRMRD_LIBRARIES@)
set(ISMRMRD_LIBRARIES    "@ISMRMRD_LIBRARIES@")

## For backwards compatibility use existing variable name
## Include directories can be lists, and should be plural
## to conform with naming schemes in many other cmake packages
set(ISMRMRD_INCLUDE_DIR  @CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS@)
set(ISMRMRD_LIB_DIR @CONFIG_ISMRMRD_LIBRARY_DIRS@)
set(ISMRMRD_INCLUDE_DIR  "@CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS@")
set(ISMRMRD_LIB_DIR "@CONFIG_ISMRMRD_LIBRARY_DIRS@")
+3 −3
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ HTML_STYLESHEET =
# cascading style sheets that are included after the standard style sheets
# created by doxygen. Using this option one can overrule certain style aspects.
# This is preferred over using HTML_STYLESHEET since it does not replace the
# standard style sheet and is therefor more robust against future updates.
# standard style sheet and is therefore more robust against future updates.
# Doxygen will copy the style sheet files to the output directory.
# Note: The order of the extra stylesheet files is of importance (e.g. the last
# stylesheet in the list overrules the setting of the previous ones in the
@@ -1618,8 +1618,8 @@ EXTRA_PACKAGES =
# Note: Only use a user-defined header if you know what you are doing! The
# following commands have a special meaning inside the header: $title,
# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
# for the replacement values of the other commands the user is refered to
# $projectbrief, $projectlogo. Doxygen will replace $title with the empty string,
# for the replacement values of the other commands the user is referred to
# HTML_HEADER.
# This tag requires that the tag GENERATE_LATEX is set to YES.

Loading