From 76c20251d564c5cae05abcc33ebbab8a375fd647 Mon Sep 17 00:00:00 2001 From: Michal Broz Date: Sun, 17 Nov 2024 12:38:08 +0100 Subject: [PATCH] Adjusting the recipies for dmpjet and starlight --- dpmjet.sh | 5 +---- starlight.sh | 13 +++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dpmjet.sh b/dpmjet.sh index 59ff8fe4b9..a4b38ac956 100644 --- a/dpmjet.sh +++ b/dpmjet.sh @@ -1,6 +1,6 @@ package: DPMJET version: "%(tag_basename)s" -tag: "v19.1.2-alice3" +tag: "v19.3.7-alice1" source: https://github.com/alisw/DPMJET.git requires: - "GCC-Toolchain:(?!osx)" @@ -22,9 +22,6 @@ cmake $SOURCEDIR \ make ${JOBS+-j $JOBS} install -cp -r $SOURCEDIR/include $INSTALLROOT/. -cp -r $SOURCEDIR/dpmdata $INSTALLROOT/. - # Modulefile MODULEDIR="$INSTALLROOT/etc/modulefiles" MODULEFILE="$MODULEDIR/$PKGNAME" diff --git a/starlight.sh b/starlight.sh index f2bdaf7bb9..eb360e163a 100644 --- a/starlight.sh +++ b/starlight.sh @@ -1,6 +1,6 @@ package: STARlight -version: "20240617" -tag: 196adefb9b840587d374b675e288b2a98fb5df0e +version: "20241115" +tag: b845eb773cd5be1ed2286e236e575519d08fed4d requires: - DPMJET - HepMC3 @@ -11,17 +11,18 @@ build_requires: source: https://github.com/STARlightsim/STARlight.git --- #!/bin/bash -ex +export DPMJET_DIR=$DPMJET_ROOT cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ -DCMAKE_SKIP_RPATH=TRUE \ -DENABLE_HEPMC3=ON \ - -DENABLE_DPMJET=ON \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ - -DBUILD_SHARED_LIB=ON \ + -DENABLE_DPMJET=ON \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DBUILD_SHARED_LIB=ON \ -DCMAKE_INSTALL_LIBDIR=lib \ -DHepMC3_DIR="$HEPMC3_ROOT" \ - -DDPMJET_DIR="$DPMJET_ROOT" + -DDPMJET_DIR="$DPMJET_ROOT" cmake --build . -- ${JOBS:+-j$JOBS} install cp libDpmJetLib.so $INSTALLROOT/lib