search

next-exp / nexus

Geant4 simulation framework of the NEXT Collaboration
5 stars 55 forks source link

Adding fix to catch.hh to fix compilation error on M1 macbook #134

Closed kvjmistry closed 2 years ago

kvjmistry commented 2 years ago

This PR edits the catch.hh file to enable compilation of nexus with mac M1. It may also be possible to update catch2 to a newer version to have the same effect.

jmalbos commented 2 years ago

Hi @kvjmistry,

It may also be possible to update catch2 to a newer version to have the same effect.

Did you actually try this?

paolafer commented 2 years ago

I've tried using the v2.13.8 version (the latest stable one, it seems), and it seems to work alright. Shall we use this one, then?

kvjmistry commented 2 years ago

I updated the file to v2.13.8 and compiled no problem too. The latest commit includes this new file.

gondiaz commented 2 years ago

Works to me in Intel Mac

jmalbos commented 2 years ago

OK, so just to be sure: we would just need this second commit, right? If that is the case, you could remove the first one from the pull request or squash both together. You should also amend the commit comment to comply with the following conventions: https://cbea.ms/git-commit/ It could be simply something like this: "Update Catch2 header to v2.13.8"

kvjmistry commented 2 years ago

OK so I have removed the first commit and have everything as one commit which just replaces the header file to the new version. The single commit has been renamed to "Update catch2 header to v2.13.8" (apologies for the poor name before).

Please let me know if this is not the case!

paolafer commented 2 years ago

That's great, Krishan, I'll approve and merge the PR as soon as the tests have passed. I'll add the link to the git conventions in the wiki, by the way!

jmalbos commented 2 years ago

Great, @kvjmistry, and congrats for your first approved nexus PR!