Backport commits from dev to jan24_patches #558
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
fuhlig1
commented
Oct 30, 2024
•
fuhlig1
commented
- Remove force in CMake install prefix #554
- Check for system installation of lohmann-json #555
- Fix macosx opengl #556
- Build ROOTs Pythia8 interface #557
dennisklein
approved these changes
Oct 30, 2024
|
Can you please link the relevant PRs in the initial comment text? (not in any commits. Using the cherry-pick text at the end is perfect.) This will also create nice "mentioned" entries in those PRs. |
(cherry picked from commit 07f9d1c) (see FairRootGroup#554)
Switch off the root builtin version if a system installation exist. On macosx there is a compilation error otherwise. (cherry picked from commit f14b375) (see FairRootGroup#555)
With new versions of the OS and/or the command line tools a OpenGL version installed with brew was used which somehow doesn't work. With the change the system version from the OpenGL framework is used. (cherry picked from commit 87daf31) (see FairRootGroup#556)
The default setting for the pythia8 interface was switched from ON to OFF such that we have to switch it on explicitely. The change in ROOT was done with commit [ebe6694](root-project/root@ebe6694) (cherry picked from commit 9551ab5) (see FairRootGroup#557)
fuhlig1
force-pushed
the
jan24_patches
branch
from
bd8f490
to
6ae43c9
Compare
|
I hope the added info was what you were asking for. |
|
@fuhlig1 well, yes. I didn't mean to edit the commit body themselves. But that doesn't hurt IMHO. I meant just editing #558 (comment) (I did that now, as you linked the neccessary info in the commit bodies.) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.