From 172d3aad91a2c3fb79f0bab8ff54c7bfc3ce922b Mon Sep 17 00:00:00 2001 From: Marko Petric <marko.petric@cern.ch> Date: Wed, 16 Mar 2016 10:47:06 +0000 Subject: [PATCH] Thanche the CMake in YML to point to the right geant --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed9b53cdf..50b354618 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ slc6-gcc48: - source .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh - mkdir build - cd build - - 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.1.2 -D DD4HEP_USE_CXX11=ON .. + - 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 -j2 - make install @@ -23,6 +23,6 @@ slc6-gcc49: - source .gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh - mkdir build - cd build - - 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.1.2 -D DD4HEP_USE_CXX14=ON .. + - 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_CXX14=ON .. - make -j2 - make install -- GitLab