Merge pull request #866 from KrisThielemans/rel4_to_master_23Apr2021

Release4 (including 4.1.0) to master 02May2021

.mailmap

@@ -41,3 +41,4 @@ Richard Brown <[email protected]>  <[email protected]>
 Robert Twyman <[email protected]> <[email protected]>
 Robert Twyman <[email protected]> <[email protected]>
 Yu-jung Tsai <[email protected]> <[email protected]>
+Gemma Fardell <[email protected]> <[email protected]>

.zenodo.json

@@ -34,15 +34,16 @@
     {"name": "Beisel, Tobias"},
     {"name": "Deidda, Daniel", "orcid": "0000-0002-2766-4339"},
     {"name": "Mustafovic, Sanida"},
-    {"name": "Biguri, Ander", "orcid": "0000-0002-2636-3032"},
     {"name": "Fischer, Jannis", "orcid": "0000-0002-8329-0220"},
+    {"name": "Biguri, Ander", "orcid": "0000-0002-2636-3032"},
     {"name": "Gillman, Ashley", "orcid": "0000-0001-9130-1092"},
     {"name": "Aguiar, Pablo"},
     {"name": "Brusaferri, Ludovica"},
-    {"name": "Pasca, Edoardo", "orcid": "0000-0001-6957-2160"},
     {"name": "Bertolli, Ottavia"},
+    {"name": "Pasca, Edoardo", "orcid": "0000-0001-6957-2160"},
     {"name": "Twyman, Robert"},
     {"name": "Dikaios, Nikos"},
+    {"name": "Fardell, Gemma", "orcid": "0000-0003-2388-5211", "affiliation":"UK Research & Innovation"},
     {"name": "Kerrouche, Nacer"},
     {"name": "Thomas, Benjamin", "orcid": "0000-0002-9784-1177"},
     {"name": "Ovtchinnikov, Evgueni"},

CMakeLists.txt

@@ -1,14 +1,6 @@
 # This file is part of STIR.
 #
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# SPDX-License-Identifier: Apache-2.0
 #
 # See STIR/LICENSE.txt for details
 
@@ -30,8 +22,6 @@ PROJECT(STIR)
 
 SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
 
-# require 2.8.3 to get FOLDER properties support (without that, we only need cmake 2.6)
-cmake_minimum_required(VERSION 2.8.3)
 if (POLICY CMP0025)
   cmake_policy(SET CMP0025 NEW) # Compiler Id for Apple Clang is AppleClang, see STIR issue #531
 endif()