diff --git a/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh b/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh index 567ed7ba1e79d66440f129cb5acb115830be4c41..8b1109334b03f24f17998e632c0e60bdfedbf4e2 100644 --- a/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh +++ b/.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh @@ -67,6 +67,15 @@ export G4INSTALL=$LCGRELEASES/Geant4/10.01.p02/x86_64-slc6-gcc48-opt/ export G4ENV_INIT="$G4INSTALL/bin/geant4.sh" export G4SYSTEM="Linux-g++" +#-------------------------------------------------------------------------------- +# QT +#-------------------------------------------------------------------------------- + +export QTDIR=$LCGRELEASES/qt/4.8.4/x86_64-slc6-gcc48-opt +export QMAKESPEC="$QTDIR/mkspecs/linux-g++" +export PATH="$QTDIR/bin:$PATH" +export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH" + #-------------------------------------------------------------------------------- # Boost #-------------------------------------------------------------------------------- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 062cc3ecc0cf3b665870499575445813d03b1243..c8edc1672420188eba9ab1dc7bd490897792d8e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ before_script: #pre-installation script - - yum install make glibc-devel openmotif-devel mesa-libGLU-devel -y + - yum install make glibc-devel openmotif-devel mesa-libGLU-devel expat-devel -y slc6-gcc48: tags: