Skip to content

Commit 85ed180

Browse files
committed
Bump pythia6 to work with new CMake
1 parent 77a4bd9 commit 85ed180

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

pythia6.sh

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,31 @@
11
# a pythia6 recipe based on the one from FairROOT
22
package: pythia6
33
version: "%(tag_basename)s"
4-
tag: "428-alice2"
4+
tag: "428-alice3"
55
source: https://github.com/alisw/pythia6.git
66
requires:
77
- GCC-Toolchain:(?!osx)
88
build_requires:
99
- CMake
10+
- ninja-fortran
11+
- alibuild-recipe-tools
1012
---
1113
#!/bin/sh
1214

1315
cmake ${SOURCEDIR} \
16+
-G Ninja \
1417
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
1518
-DCMAKE_INSTALL_PREFIX=${INSTALLROOT} \
1619
-DCMAKE_INSTALL_LIBDIR=lib
17-
make ${JOBS+-j$JOBS}
18-
make install
20+
cmake --build . -- ${JOBS:+-j$JOBS} install
1921

2022
# Modulefile
2123
MODULEDIR="$INSTALLROOT/etc/modulefiles"
2224
MODULEFILE="$MODULEDIR/$PKGNAME"
2325
mkdir -p "$MODULEDIR"
26+
alibuild-generate-module --lib > "$MODULEDIR"
2427
cat > "$MODULEFILE" <<EoF
25-
#%Module1.0
26-
proc ModulesHelp { } {
27-
global version
28-
puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
29-
}
30-
set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
31-
module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
32-
# Dependencies
33-
module load BASE/1.0
34-
# Our environment
35-
set PYTHIA6_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
3628
setenv PYTHIA6_ROOT \$PYTHIA6_ROOT
37-
prepend-path LD_LIBRARY_PATH \$PYTHIA6_ROOT/lib
3829
prepend-path AGILE_GEN_PATH \$PYTHIA6_ROOT
3930
EoF
4031

0 commit comments

Comments
 (0)