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

Backport commits from dev to jan24_patches #558

Open
wants to merge 4 commits into
base: jan24_patches
Choose a base branch
from
Open

Backport commits from dev to jan24_patches #558

wants to merge 4 commits into from

Commits on Oct 30, 2024

  1. Remove force in CMake install prefix 

    (cherry picked from commit 07f9d1c)
(see FairRootGroup#554)
    @YanzhaoW @fuhlig1
    YanzhaoW authored and fuhlig1 committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    51e14f6 View commit details
    Browse the repository at this point in the history

  2. Check for system installation of lohmann-json 

    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)
    @fuhlig1
    fuhlig1 committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    8b4eeb0 View commit details
    Browse the repository at this point in the history

  3. Fix OpenGL on macosx 

    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)
    @fuhlig1
    fuhlig1 committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a5a3ae5 View commit details
    Browse the repository at this point in the history

  4. [legacy] root: Build ROOTs Pythia8 interface 

    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
    fuhlig1 committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    6ae43c9 View commit details
    Browse the repository at this point in the history