diff --git a/CHANGELOG.md b/CHANGELOG.md index e337eca2..faf18159 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ Until May 2022 (inclusive) no changelog was kept. We might try to reconstruct it * FairRoot: Add missing GEANT3 dependency * EvtGen: Fix detection of C++11 * ACTS/Eigen3/Hepmc3: Fixed module detection +* FairShip: Find python paths correctly ### Changed diff --git a/fairship.sh b/fairship.sh index c8c514d1..555a101c 100644 --- a/fairship.sh +++ b/fairship.sh @@ -96,8 +96,8 @@ cmake $SOURCEDIR \ -DHEPMC_INCLUDE_DIR=$HEPMC_ROOT/include/HepMC \ -DEVTGEN_INCLUDE_DIR=$EVTGEN_ROOT/include \ -DEVTGEN_LIBRARY_DIR=$EVTGEN_ROOT/lib \ - ${PYTHON_ROOT:+-DPYTHON_LIBRARY=$PYTHON_ROOT/lib} \ - ${PYTHON_ROOT:+-DPYTHON_INCLUDE_DIR=$PYTHON_ROOT/include/python3.6m/} \ + -DPYTHON_INCLUDE_DIR=$(python -c "import sysconfig; print(sysconfig.get_path('include'))") \ + -DPYTHON_LIBRARY=$(python -c "import sysconfig; print(sysconfig.get_config_var('LIBDIR'))") \ -DPYTHIA8_DIR=$PYTHIA_ROOT \ -DPYTHIA8_INCLUDE_DIR=$PYTHIA_ROOT/include \ -DGEANT4_ROOT=$GEANT4_ROOT \