diff --git a/CHANGELOG.md b/CHANGELOG.md index 481da00..0094fc5 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 * 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 diff --git a/faircmakemodules.sh b/faircmakemodules.sh index 53f04a3..490b512 100644 --- a/faircmakemodules.sh +++ b/faircmakemodules.sh @@ -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 < "$INSTALLROOT/etc/modulefiles/$PKGNAME" diff --git a/fairroot.sh b/fairroot.sh index 74c0450..5ca9efb 100644 --- a/fairroot.sh +++ b/fairroot.sh @@ -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 @@ -9,6 +9,7 @@ requires: - VMC - boost - protobuf + - FairCMakeModules - FairLogger - FairMQ - yaml-cpp @@ -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