Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Until May 2022 (inclusive) no changelog was kept. We might try to reconstruct it
* VMC: Update to 2-1
* GSL: Update to 2.8 for ROOT compatibility
* libpng: update to 1.6.47
* FairRoot: Update to 19.0.0

### Removed

Expand Down
28 changes: 8 additions & 20 deletions faircmakemodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,17 @@ tag: v1.0.0
source: https://github.com/FairRootGroup/FairCMakeModules
build_requires:
- CMake
- "GCC-Toolchain:(?!osx)"
- alibuild-recipe-tools
---
#!/bin/sh

cmake -S $SOURCEDIR -B . \
-DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \
cmake -S "$SOURCEDIR" -B . \
-DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \
${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \
${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE}

cmake --build . --target install
cmake --build . --target install ${JOBS:+-- -j$JOBS}

# Modulefile
mkdir -p etc/modulefiles
cat > etc/modulefiles/$PKGNAME <<EoF
#%Module1.0
proc ModulesHelp { } {
global version
puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
}
set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
# Dependencies
module load BASE/1.0
# Our environment
set FAIRCMAKEMODULES_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
EoF
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
mkdir -p "$INSTALLROOT/etc/modulefiles"
alibuild-generate-module --cmake > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
8 changes: 5 additions & 3 deletions fairroot.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: FairRoot
version: "v18.8.2"
tag: "v18.8.2"
version: "v19.0.0"
tag: "v19.0.0"
source: https://github.com/FairRootGroup/FairRoot
requires:
- generators
Expand All @@ -9,6 +9,7 @@ requires:
- VMC
- boost
- protobuf
- FairCMakeModules
- FairLogger
- FairMQ
- yaml-cpp
Expand Down Expand Up @@ -69,7 +70,8 @@ cmake $SOURCEDIR
${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD} \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=$INSTALLROOT
-DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
-DFairCMakeModules_DIR=$FAIRCMAKEMODULES_ROOT/share/cmake/FairCMakeModules-${FAIRCMAKEMODULES_VERSION#v}

cmake --build . -- -j$JOBS install

Expand Down