Merge branch 'master' of https://github.com/SyneRBI/SIRF

.zenodo.json

@@ -3,6 +3,7 @@
   "keywords": [
     "image-reconstruction", "pet-mr", "medical-imaging"],
   "related_identifiers": [
+    {"identifier":, "10.1098/rsta.2020.0208", "relation": "documents"},
     {"identifier": "10.1016/j.cpc.2019.107087", "relation": "documents"},
     {"identifier": "10.1109/NSSMIC.2017.8532815", "relation": "documents"}],
   "communities": [{"identifier": "ccp-petmr"},{"identifier": "synerbi"}],
@@ -18,7 +19,8 @@
     {"name": "Gillman, Ashley", "orcid": "0000-0001-9130-1092", "affiliation": "Commonwealth Scientific and Industrial Research Organisation, and University of Queensland"},
     {"name": "Biguri, Ander", "orcid": "0000-0002-2636-3032", "affiliation": "University College London"},
     {"name": "Deidda, Daniel", "orcid": "0000-0002-2766-4339", "affiliation": "National Physical Laboratory (UK)"},
-    {"name": "Ehrhardt, Matthias J.", "affiliation": "University of Bath"},
+      {"name": "Ehrhardt, Matthias J.", "orcid": "0000-0001-8523-353X", "affiliation": "University of Bath"},
+    {"name": "Papoutsellis, Evangelos", "affiliation":"UK Research & Innovation"},
     {"name": "Whitehead, Alexander C.", "orcid": "0000-0002-9151-3295", "affiliation": "University College London"},
     {"name": "Fardell, Gemma", "orcid": "0000-0003-2388-5211", "affiliation":"UK Research & Innovation"},    
     {"name": "Thomas, Ben", "orcid": "0000-0002-9784-1177", "affiliation": "University College London"},

CMakeLists.txt

@@ -194,6 +194,17 @@ set(SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/SIRF-${VERSION_MAJOR}.${VERSION_MINO
 configure_file("cmake/version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake/include/sirf/common/version.h")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cmake/include/sirf/common/version.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/sirf/common/")
 
+if (CMAKE_VERSION VERSION_LESS 3.21.0)
+  # Possibly superfluous finding of HDF5, looking for both C and CXX libraries
+  # This is an attempt to overcome https://gitlab.kitware.com/cmake/cmake/-/issues/20909
+  # We will try to find ISMRMRD and STIR later. The former needs HDF C, the latter HDF5 CXX.
+  # By looking for both first, CMake will populate targets for HDF5 for both C and CXX.
+  #
+  # Note that this is slightly dangerous if there are multiple versions of HDF5 on the system.
+  # ISMRMRD and STIR might be looking for a specific version while the statement below doesn't.
+  find_package(HDF5 COMPONENTS C CXX QUIET)
+endif()
+
 ADD_SUBDIRECTORY(src)
 
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/setup.py.cmake")