Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DO NOT MERGE - Margaret just testing CIL/SIRF tests #905

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

DO NOT MERGE - Margaret just testing CIL/SIRF tests #905

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50d1f07
Update version_config.cmake
MargaretDuff Jun 11, 2024
2f23129
Update version_config.cmake
MargaretDuff Jun 21, 2024
3f63715
Update version_config.cmake
MargaretDuff Jun 21, 2024
d33591f
Changed CIL tag
MargaretDuff Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions version_config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -221,7 +221,7 @@ if (DEVEL_BUILD)

# CCPi CIL
set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL)
set(DEFAULT_CIL_TAG origin/master)
set(DEFAULT_CIL_TAG origin/CIL-sirf-tvwarmstart)

# Gadgetron
# set(DEFAULT_Gadgetron_TAG origin/master)
Expand Down
Loading