Merge ACTS defaults into release defaults

acts.sh

@@ -10,6 +10,13 @@ requires:
   - boost
   - Eigen3
   - alibuild-recipe-tools
+env:
+  "ACTS_ROOT": "$ACTS_ROOT"
+prepend_path:
+  "ROOT_INCLUDE_PATH": "$ACTS_ROOT/include"
+  "PYTHONPATH": "$ACTS_ROOT/python"
+prefer_system_check: |
+  ls $ACTS_ROOT/include && ls $ACTS_ROOT/lib64/libActsCore.so
 ---
 #!/bin/bash -e
 
@@ -26,7 +33,9 @@ cmake "$SOURCEDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \
   -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON \
   -DACTS_BUILD_EXAMPLES_PYTHIA8=ON \
   -DACTS_BUILD_EXAMPLES_GEANT4=OFF \
+  -DCMAKE_POLICY_DEFAULT_CMP0144=NEW \
   -DCMAKE_VERBOSE_MAKEFILE=1 \
+  -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
   -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
 
 

boost.sh

@@ -1,20 +1,18 @@
 package: boost
 version: "%(tag_basename)s"
-tag: "v1.75.0"
+tag: "v1.83.0"
 source: https://github.com/alisw/boost.git
 requires:
   - "GCC-Toolchain:(?!osx)"
   - Python
-  - libpng
-  - zlib
 build_requires:
   - lzma
   - bz2
   - alibuild-recipe-tools
 prepend_path:
   ROOT_INCLUDE_PATH: "$BOOST_ROOT/include"
 prefer_system_check: |
- printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 106400)\n#error \"Cannot use system's boost. Boost > 1.64.00 required.\"\n#endif\nint main(){}" \
+ printf "#include \"boost/version.hpp\"\n# if (BOOST_VERSION < 107700)\n#error \"Cannot use system's boost. Boost > 1.77.00 required.\"\n#endif\nint main(){}" \
  | gcc -I$BOOST_ROOT/include -xc++ - -o /dev/null
 ---
 BOOST_PYTHON=

eigen3.sh

@@ -5,6 +5,8 @@ build_requires:
   - "GCC-Toolchain:(?!osx)"
   - CMake
   - alibuild-recipe-tools
+prefer_system_check: |
+  ls $EIGEN3_ROOT/include/eigen3/Eigen/Dense
 ---
 #!/bin/bash -e
 MODULEDIR="$INSTALLROOT/etc/modulefiles"

fairroot.sh

@@ -53,6 +53,7 @@ cmake $SOURCEDIR
       ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"}                                             \
       ${MACOSX_RPATH:+-DMACOSX_RPATH=${MACOSX_RPATH}}                                       \
       -DCMAKE_CXX_FLAGS="$CXXFLAGS"                                                         \
+      -DCMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE=PRE_TEST                                   \
       ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE}                             \
       -DROOTSYS=$ROOTSYS                                                                    \
       -DPythia6_LIBRARY_DIR=$PYTHIA6_ROOT/lib                                               \
@@ -73,6 +74,7 @@ cmake $SOURCEDIR
       ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD}                                               \
       -DCMAKE_EXPORT_COMPILE_COMMANDS=ON                                                    \
       -DCMAKE_INSTALL_LIBDIR=lib                                                            \
+      -DCMAKE_POLICY_DEFAULT_CMP0167=NEW \
       -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
       -DFairCMakeModules_ROOT=$FAIRCMAKEMODULES_ROOT
 

fairship.sh

@@ -15,6 +15,8 @@ requires:
   - ROOT
   - ROOTEGPythia6
   - VMC
+  - HepMC3
+  - acts
 build_requires:
   - FairCMakeModules
 env:

gcc-toolchain.sh

@@ -1,6 +1,6 @@
 package: GCC-Toolchain
 version: "%(tag_basename)s"
-tag: alice/v11
+tag: v13.2.0-alice1
 source: https://github.com/alisw/gcc-toolchain
 prepend_path:
   "LD_LIBRARY_PATH": "$GCC_TOOLCHAIN_ROOT/lib64"
@@ -12,7 +12,7 @@
 prefer_system_check: |
   set -e
   which gfortran || { echo "gfortran missing"; exit 1; }
-  which cc && test -f $(dirname $(which cc))/c++ && printf "#define GCCVER ((__GNUC__ << 16)+(__GNUC_MINOR__ << 8)+(__GNUC_PATCHLEVEL__))\n#if (GCCVER < 0x060000 || GCCVER > 0x100000)\n#error \"System's GCC cannot be used: we need GCC 6.X. We are going to compile our own version.\"\n#endif\n" | cc -xc++ - -c -o /dev/null
+  which gcc && test -f $(dirname $(which gcc))/c++ && printf "#define GCCVER ((__GNUC__ * 10000)+(__GNUC_MINOR__ * 100)+(__GNUC_PATCHLEVEL__))\n#if (GCCVER < 130000)\n#error \"System's GCC cannot be used: we need at least GCC $REQUESTED_VERSION We are going to compile our own version.\"\n#endif\n" | gcc -xc++ - -c -o /dev/null
 ---
 #!/bin/bash -e
 

hepmc3.sh

@@ -12,6 +12,8 @@ env:
   "HEPMC3": "$HEPMC3_ROOT"
 prepend_path:
   "ROOT_INCLUDE_PATH": "$HEPMC3_ROOT/include"
+prefer_system_check: |
+  ls $HEPMC3_ROOT/include/HepMC3 && ls $HEPMC3_ROOT/lib/libHepMC3.so
 ---
 #!/bin/bash -e
 MODULEDIR="$INSTALLROOT/etc/modulefiles"