From 50d1f07773849214e79aa953ee8864014af31c86 Mon Sep 17 00:00:00 2001 From: Margaret Duff <43645617+MargaretDuff@users.noreply.github.com> Date: Tue, 11 Jun 2024 13:45:07 +0100 Subject: [PATCH 1/4] Update version_config.cmake --- version_config.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version_config.cmake b/version_config.cmake index b806fb94..3c281195 100644 --- a/version_config.cmake +++ b/version_config.cmake @@ -220,8 +220,8 @@ if (DEVEL_BUILD) # set(DEFAULT_pet_rd_tools_TAG origin/master) # CCPi CIL - set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL) - set(DEFAULT_CIL_TAG origin/master) + set(DEFAULT_CIL_URL https://github.com/epapoutsellis/CIL) + set(DEFAULT_CIL_TAG origin/test_CIL_SIRF_precond) # Gadgetron # set(DEFAULT_Gadgetron_TAG origin/master) From 2f23129d2f1e7f3386cb620a34914c1e9dbd6edb Mon Sep 17 00:00:00 2001 From: Margaret Duff <43645617+MargaretDuff@users.noreply.github.com> Date: Fri, 21 Jun 2024 09:57:31 +0100 Subject: [PATCH 2/4] Update version_config.cmake --- version_config.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version_config.cmake b/version_config.cmake index 3c281195..614b89e0 100644 --- a/version_config.cmake +++ b/version_config.cmake @@ -220,8 +220,8 @@ if (DEVEL_BUILD) # set(DEFAULT_pet_rd_tools_TAG origin/master) # CCPi CIL - set(DEFAULT_CIL_URL https://github.com/epapoutsellis/CIL) - set(DEFAULT_CIL_TAG origin/test_CIL_SIRF_precond) + set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL/) + set(DEFAULT_CIL_TAG origin/CIL-sirf-tvwarmstart) # Gadgetron # set(DEFAULT_Gadgetron_TAG origin/master) From 3f63715dde6a98c2bba19c1eb3d7fbdd78cbccae Mon Sep 17 00:00:00 2001 From: Margaret Duff <43645617+MargaretDuff@users.noreply.github.com> Date: Fri, 21 Jun 2024 10:23:25 +0100 Subject: [PATCH 3/4] Update version_config.cmake --- version_config.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_config.cmake b/version_config.cmake index 614b89e0..b35db654 100644 --- a/version_config.cmake +++ b/version_config.cmake @@ -220,7 +220,7 @@ if (DEVEL_BUILD) # set(DEFAULT_pet_rd_tools_TAG origin/master) # CCPi CIL - set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL/) + set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL) set(DEFAULT_CIL_TAG origin/CIL-sirf-tvwarmstart) # Gadgetron From d33591fdf412f49444a15a41dd5f1fbf7f1fbc46 Mon Sep 17 00:00:00 2001 From: Margaret Duff <43645617+MargaretDuff@users.noreply.github.com> Date: Fri, 21 Jun 2024 10:45:47 +0100 Subject: [PATCH 4/4] Changed CIL tag --- version_config.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_config.cmake b/version_config.cmake index b35db654..59d12ec5 100644 --- a/version_config.cmake +++ b/version_config.cmake @@ -161,7 +161,7 @@ set(DEFAULT_JSON_TAG v3.11.3) # CCPi CIL # minimum supported version of CIL supported is > 22.1.0 or from commit a6062410028c9872c5b355be40b96ed1497fed2a set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL) -set(DEFAULT_CIL_TAG ccf17f393ba911d13b74f2327779dde030098fe6) # 28 May 2024 +set(DEFAULT_CIL_TAG a63996a6bddd1c29f9fd83abb28dc79ee632e716) # 28 May 2024 set(DEFAULT_CCPi-Regularisation-Toolkit_URL https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit) set(DEFAULT_CCPi-Regularisation-Toolkit_TAG "v24.0.1")