From aa7bbe606e8b1b10ddfc230da14940078c05e187 Mon Sep 17 00:00:00 2001 From: Gloria Corti <gloria.corti@cern.ch> Date: Fri, 10 Jun 2016 16:32:09 +0200 Subject: [PATCH] Merge branch 'gcorti-forv96r4p4' into 'Sim09' Changes to build Gauss v49r6p4 with cmt Changes in project.cmt to depend from Gaudi v27r1. Also changes in requirements of g4config to match environment variable See merge request !9 --- Geant4/G4config/cmt/requirements | 4 ++-- cmt/project.cmt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Geant4/G4config/cmt/requirements b/Geant4/G4config/cmt/requirements index 7caa2e6..84c366b 100755 --- a/Geant4/G4config/cmt/requirements +++ b/Geant4/G4config/cmt/requirements @@ -1,5 +1,5 @@ package G4config -version v96r4p3 +version v96r4p4 branches cmt doc @@ -19,7 +19,7 @@ use Geant4Files v96r* -no_auto_imports #============================================================================== set G4_native_version "9.6.p04" \ override-geant4-version "${G4_NATIVE_VERSION}" -set G4VERS v96r4p2 +set G4VERS v96r4p4 # ============================================================================= # set Geant4 environment variables diff --git a/cmt/project.cmt b/cmt/project.cmt index 5aefbf4..a4db351 100755 --- a/cmt/project.cmt +++ b/cmt/project.cmt @@ -1,6 +1,6 @@ project GEANT4 -use GAUDI GAUDI_v26r4 +use GAUDI GAUDI_v27r1 use PARAM build_strategy with_installarea -- GitLab