From de563c8ee2a62d17519622a27235606912d7c707 Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Thu, 1 Feb 2024 14:52:19 +0000 Subject: [PATCH 1/2] update to ROOT v6-28-12 --- CHANGES.md | 1 + version_config.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 4553f877..c4d29116 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,7 @@ - siemens_to_ismrmrd: v1.2.11 - CIL: db5a2a6cd3bddfbbf53e65f0549ac206096e5b44 (version of Feb 13, 2024) - CCPi-Regularisation-Toolkit: 71f8d304d804b54d378f0ed05539f01aaaf13758 (version of Dec 3. 2023) + - ROOT: v6-28-12 ## v3.5.0 - Temporarily disable CCPi-Regularisation due to #832 diff --git a/version_config.cmake b/version_config.cmake index 42b8a563..16bc620b 100644 --- a/version_config.cmake +++ b/version_config.cmake @@ -167,7 +167,7 @@ set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "71f8d304d804b54d378f0ed05539f01aaaf # CERN ROOT set(DEFAULT_ROOT_URL https://github.com/root-project/root) -set(DEFAULT_ROOT_TAG "v6-26-10") +set(DEFAULT_ROOT_TAG "v6-28-12") # ACE set(DEFAULT_ACE_URL https://github.com/paskino/libace-conda) From c35d287e67a25e3c27b79a1ce555c31c0fb5319c Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Wed, 7 Feb 2024 22:11:02 +0000 Subject: [PATCH 2/2] update nlohmann/json to 3.11.3 Recent ROOT seems to require 3.11.0 --- CHANGES.md | 1 + version_config.cmake | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c4d29116..242f55c3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,7 @@ - CIL: db5a2a6cd3bddfbbf53e65f0549ac206096e5b44 (version of Feb 13, 2024) - CCPi-Regularisation-Toolkit: 71f8d304d804b54d378f0ed05539f01aaaf13758 (version of Dec 3. 2023) - ROOT: v6-28-12 + - nlohmann/json: 3.11.3 ## v3.5.0 - Temporarily disable CCPi-Regularisation due to #832 diff --git a/version_config.cmake b/version_config.cmake index 16bc620b..a810c015 100644 --- a/version_config.cmake +++ b/version_config.cmake @@ -155,7 +155,7 @@ set(DEFAULT_SPM_URL https://github.com/spm/SPM12) set(DEFAULT_SPM_TAG r7771) set(DEFAULT_JSON_URL https://github.com/nlohmann/json) -set(DEFAULT_JSON_TAG v3.10.4) +set(DEFAULT_JSON_TAG v3.11.3) # CCPi CIL # minimum supported version of CIL supported is > 22.1.0 or from commit a6062410028c9872c5b355be40b96ed1497fed2a