Commit 719f195b authored by Jan Möbius's avatar Jan Möbius

Moved clang from qt 5.5 to 5.11.2

parent 72996deb
Pipeline #8009 canceled with stages
in 2 minutes and 53 seconds
......@@ -175,12 +175,12 @@ debug-test-gcc-c++11-Qt5.11.2:
clang-c++11-Qt5:
clang-c++11-Qt5.11.2:
stage: Build
variables:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5"
QTVERSION: "QT5.11.2"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
......@@ -224,19 +224,19 @@ debug-clang-c++11-Qt5.9.0:
paths:
- artifacts
test-clang-c++11-Qt5:
test-clang-c++11-Qt5.11.2:
stage: Test
variables:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5"
QTVERSION: "QT5.11.2"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
- MultiThreads
dependencies:
- clang-c++11-Qt5
- clang-c++11-Qt5.11.2
artifacts:
paths:
- build-Release-clang-cpp11-qt5/Testing/Temporary/LastTest.log
......
......@@ -47,12 +47,7 @@ elif [ "$LANGUAGE" == "C++11" ]; then
BUILDPATH="$BUILDPATH-cpp11"
fi
if [ "$QTVERSION" == "QT5" ]; then
echo "Using QT5";
BUILDPATH="$BUILDPATH-qt5"
OPTIONS="$OPTIONS =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:$LD_LIBRARY_PATH
elif [ "$QTVERSION" == "QT5.11.2" ]; then
if [ "$QTVERSION" == "QT5.11.2" ]; then
echo "Using QT5.11.2";
BUILDPATH="$BUILDPATH-qt5.11.2"
OPTIONS="$OPTIONS -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.11.2/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.11.2/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.11.2/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64"
......
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