Skip to content

Commit

Permalink
Applied fixes:
Browse files Browse the repository at this point in the history
- Update VMC packages versions for patches:
  - geant3 version v2-7-p1 for Root 5 and v3-3 for Root 6
  - geant4_vmc v5-0-p2
- Avoid installing FairRoot in lib64 (what causes test failures on CC7)
  - added CMAKE_INSTALL_LIBDIR
  • Loading branch information
ihrivnac committed Apr 20, 2020
1 parent ea9b545 commit dc70166
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions defaults-prod-latest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ overrides:

# Use VMC packages compatible with ROOT 5
GEANT3:
version: "v2-7"
tag: "v2-7"
version: "v2-7-p1"
tag: "v2-7-p1"
GEANT4_VMC:
version: "v3-6-p6-inclxx-biasing-p2"
tag: "v3-6-p6-inclxx-biasing-p2"
Expand Down
4 changes: 2 additions & 2 deletions defaults-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ overrides:

# Use VMC packages compatible with ROOT 5
GEANT3:
version: "v2-7"
tag: "v2-7"
version: "v2-7-p1"
tag: "v2-7-p1"
GEANT4_VMC:
version: "v3-6-p6-inclxx-biasing-p2"
tag: "v3-6-p6-inclxx-biasing-p2"
Expand Down
3 changes: 2 additions & 1 deletion fairroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ prepend_path:
---
# Making sure people do not have SIMPATH set when they build fairroot.
# Unfortunately SIMPATH seems to be hardcoded in a bunch of places in
# fairroot, so this really should be cleaned up in FairRoot itself for
# fairroot, so this really should be cleaned up in FairRoot itself for
# maximum safety.
unset SIMPATH

Expand Down Expand Up @@ -63,6 +63,7 @@ cmake $SOURCEDIR
${PROTOBUF_ROOT:+-DProtobuf_PROTOC_EXECUTABLE=$PROTOBUF_ROOT/bin/protoc} \
${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD} \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=$INSTALLROOT

cmake --build . -- -j$JOBS install
Expand Down
4 changes: 2 additions & 2 deletions geant3.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: GEANT3
version: "%(tag_basename)s"
tag: v3-2
tag: v3-3
requires:
- ROOT
build_requires:
Expand All @@ -20,7 +20,7 @@ make ${JOBS:+-j $JOBS} install

[[ ! -d $INSTALLROOT/lib64 ]] && ln -sf lib $INSTALLROOT/lib64

# Modulefile
# Modulefile
MODULEDIR="$INSTALLROOT/etc/modulefiles"
MODULEFILE="$MODULEDIR/$PKGNAME"
mkdir -p "$MODULEDIR"
Expand Down
2 changes: 1 addition & 1 deletion geant4_vmc.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: GEANT4_VMC
version: "%(tag_basename)s"
tag: "v5-0"
tag: "v5-0-p2"
source: https://github.com/vmc-project/geant4_vmc
requires:
- ROOT
Expand Down

0 comments on commit dc70166

Please sign in to comment.