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.

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

Fix cil astra #747

Merged
merged 12 commits into from
Jul 19, 2022
Merged

Fix cil astra #747

merged 12 commits into from
Jul 19, 2022

Conversation

paskino
Copy link
Contributor

@paskino paskino commented Jul 18, 2022

Fixes updates for CIL ASTRA git-failing because an untracked file is in the sources.

Tested on updating SIRF 3.1.0 VM downloaded from zenodo with the command

cd devel/SyneRBI_VM
git fetch --all
git reset --hard
git checkout update_from_superbuild
# clean the SIRF-Exercises.
# if the machine has not been used it's easier to delete the SIRF-Exercises directory
cd ..
rm -rf SIRF-Exercises
.SyneRBI_VM/scripts/update_VM.sh -s -t origin/fix_cil-astra -j 1

This updates SIRF to 3.3.0 (master).

Still it doesn't update CIL, for instance, but it does rebuild ISMRMRD to 1.7 with support for the utilities, thereby fixing #745

@paskino
Copy link
Contributor Author

paskino commented Jul 18, 2022

Failures are (around line 10000)

CMake Error: Error processing file: /home/runner/work/SIRF-SuperBuild/SIRF-SuperBuild/build/builds/CIL-ASTRA/tmp/CIL-ASTRA-gitupdate.cmake

Copy link
Member

@KrisThielemans KrisThielemans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Best to document in the file why this needs to be done. We will forget...

Does cmake -E rm accept multiply files to make this a bit shorter?

SuperBuild/External_CIL-ASTRA.cmake Show resolved Hide resolved
@KrisThielemans
Copy link
Member

do we really need to call to the git-update? Seems to rely quite heavily on internals of the External project stuff

@paskino
Copy link
Contributor Author

paskino commented Jul 18, 2022

The rationale is:

  1. I need to remove a few files from the source code otherwise git complains
  2. I also want to proceed doing the standard git updates stuff that happen in ExternalProject_Add

As far as I understand, there is no command I can run before update. So I am hijacking it to first remove the unwanted files, then continue with the standard update that would be done in ExternalProject_Add

But maybe this will only work for the 3.1.0 VM?

@KrisThielemans KrisThielemans added this to the v3.3 milestone Jul 19, 2022
@KrisThielemans KrisThielemans merged commit 315d1b6 into master Jul 19, 2022
@KrisThielemans KrisThielemans deleted the fix_cil-astra branch July 19, 2022 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants