From 843c7942d56bdd1489cc40a8a7504a5ec89fac3b Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Tue, 15 Mar 2016 15:08:10 +0000
Subject: [PATCH] Add QT to enviroment
---
.gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh | 9 +++++++++
.gitlab-ci.yml | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
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 567ed7ba1..8b1109334 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 062cc3ecc..c8edc1672 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:
--
GitLab