From a52e0cb1bbb4b21fbe461bc0c88f44cefb54cd22 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Thu, 7 Apr 2016 17:43:34 +0000
Subject: [PATCH] source genat init script in CI
---
.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh | 4 ++++
.gitlab-ci.yml | 1 -
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh b/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
index 62befbb36..c1873da5c 100644
--- a/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
+++ b/.gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
@@ -90,3 +90,7 @@ export BOOST_ROOT=$LCGRELEASES/Boost/1.59.0_python2.7/x86_64-centos7-gcc49-opt
export XercesC_HOME=$LCGRELEASES/XercesC/3.1.1p1/x86_64-centos7-gcc49-opt
export PATH="$XercesC_HOME/bin:$PATH"
export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
+
+
+# --- source GEANT4 INIT script ---
+test -r ${G4ENV_INIT} && { cd $(dirname ${G4ENV_INIT}) ; . ./$(basename ${G4ENV_INIT}) ; cd $OLDPWD ; }
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57feb90bf..424dee092 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ slc6-gcc48:
- source .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
- mkdir build
- cd build
- - source $G4ENV_INIT
- cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX11=ON ..
- make -j4
- make install
--
GitLab