Commit 1bac2388 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'hotFixCTestLibs' into 'master'

set library path for qt version when running ci script

Closes #123

See merge request !293
parents ce13d826 a0fbddbc
Pipeline #5428 canceled with stage
in 2 minutes and 54 seconds
......@@ -53,6 +53,7 @@ elif [ "$QTVERSION" == "QT5" ]; then
echo "Building with QT5";
BUILDPATH="$BUILDPATH-qt5"
OPTIONS="$OPTIONS -DFORCE_QT4=FALSE -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.2-qt5/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.2-qt5/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.2-qt5/lib/libqwt-qt5.so -DQT5_INSTALL_PATH=~/sw/qt-5.5.1/5.5/gcc_64"
export LD_LIBRARY_PATH=~/sw/qt-5.5.1/5.5/gcc_64/lib
elif [ "$QTVERSION" == "QT5.9.0" ]; then
echo "Building with QT5.9.0";
BUILDPATH="$BUILDPATH-qt5.9.0"
......
Subproject commit 77f68b241737d69836d45687a55aeb28b40a5011
Subproject commit 26a7c0e8e17d73695b73b82a07763a12fc3a2c11
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment