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

Jump to bottom

update to ROOT v6-28-12 #859

Merged
merged 2 commits into from
Feb 29, 2024
Merged

update to ROOT v6-28-12 #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de563c8
update to ROOT v6-28-12
KrisThielemans Feb 1, 2024
c35d287
update nlohmann/json to 3.11.3
KrisThielemans Feb 7, 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
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
- 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
- nlohmann/json: 3.11.3

## v3.5.0
- Temporarily disable CCPi-Regularisation due to #832
Expand Down
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 @@ -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
Expand All @@ -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)
Expand Down
Loading