Commit abc6908f authored by Jan Möbius's avatar Jan Möbius

Merge branch 'Move_to_Qt-5.7_for_VS2013' into 'master'

Added qt 5.11.2 for Linux

See merge request !330
parents 128e2b50 a52a07a5
Pipeline #7808 failed with stages
in 41 minutes and 21 seconds
......@@ -21,6 +21,26 @@ gcc-c++11-Qt5:
paths:
- artifacts
test-gcc-c++11-Qt5:
stage: Test
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5
artifacts:
paths:
- build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log
gcc-c++11-Qt5.9.0:
stage: Build
variables:
......@@ -35,7 +55,25 @@ gcc-c++11-Qt5.9.0:
expire_in: 1 week
paths:
- artifacts
test-gcc-c++11-Qt5.9.0:
stage: Test
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5.9.0
artifacts:
paths:
- build-Release-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log
debug-gcc-c++11-Qt5.9.0:
stage: Build
variables:
......@@ -51,104 +89,140 @@ debug-gcc-c++11-Qt5.9.0:
expire_in: 1 week
paths:
- artifacts
clang-c++11-Qt5:
stage: Build
debug-test-gcc-c++11-Qt5.9.0:
stage: Test
variables:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
BUILDTYPE: "Debug"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
- MultiThreads
dependencies:
- debug-gcc-c++11-Qt5.9.0
artifacts:
expire_in: 1 week
paths:
- artifacts
clang-c++11-Qt5.9.0:
- build-Debug-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log
gcc-c++11-Qt5.11.2:
stage: Build
variables:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.11.2"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- artifacts
debug-clang-c++11-Qt5.9.0:
test-gcc-c++11-Qt5.11.2:
stage: Test
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.11.2"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5.11.2
artifacts:
paths:
- build-Release-gcc-cpp11-qt5.11.2/Testing/Temporary/LastTest.log
debug-gcc-c++11-Qt5.11.2:
stage: Build
variables:
COMPILER: "clang"
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
QTVERSION: "QT5.11.2"
BUILDTYPE: "Debug"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- artifacts
test-gcc-c++11-Qt5:
debug-test-gcc-c++11-Qt5.11.2:
stage: Test
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5"
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
QTVERSION: "QT5.11.2"
BUILDTYPE: "Debug"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5
- debug-gcc-c++11-Qt5.11.2
artifacts:
paths:
- build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log
- build-Debug-gcc-cpp11-qt5.11.2/Testing/Temporary/LastTest.log
test-gcc-c++11-Qt5.9.0:
stage: Test
variables:
COMPILER: "gcc"
LANGUAGE: "C++11"
clang-c++11-Qt5:
stage: Build
variables:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- artifacts
clang-c++11-Qt5.9.0:
stage: Build
variables:
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
dependencies:
- gcc-c++11-Qt5.9.0
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- build-Release-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log
- artifacts
debug-test-gcc-c++11-Qt5.9.0:
stage: Test
debug-clang-c++11-Qt5.9.0:
stage: Build
variables:
COMPILER: "gcc"
COMPILER: "clang"
LANGUAGE: "C++11"
QTVERSION: "QT5.9.0"
BUILDTYPE: "Debug"
GIT_STRATEGY: none
script: "artifacts/CI/ci-linux-test.sh"
GIT_SUBMODULE_STRATEGY: recursive
script: "CI/ci-linux-build.sh"
tags:
- Linux
dependencies:
- debug-gcc-c++11-Qt5.9.0
- MultiThreads
artifacts:
expire_in: 1 week
paths:
- build-Debug-gcc-cpp11-qt5.9.0/Testing/Temporary/LastTest.log
- artifacts
test-clang-c++11-Qt5:
stage: Test
......@@ -232,22 +306,6 @@ VS2015-Qt-5.10.1-x64:
paths:
- artifacts
VS2015-Qt-5.10.1-x32:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2015"
tags:
- VS2015
- Qt5101
artifacts:
expire_in: 1 week
paths:
- artifacts
VS2017-Qt-5.10.1:
stage: Build
script: "CI\\ci-windows-build.bat"
......@@ -298,24 +356,6 @@ Test:VS2015-Qt-5.10.1-x64:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2015-Qt-5.10.1-x32:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2015
- Qt5101
dependencies:
- VS2015-Qt-5.10.1-x32
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2017-Qt-5.10.1:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
......@@ -373,27 +413,6 @@ Deploy:VS2015-Qt-5.10.1-x64:
paths:
- rel/*.exe
Deploy:VS2015-Qt-5.10.1-x32:
stage: Deploy
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x32"
QT_VERSION: "Qt5.10.1"
COMPILER: "VS2015"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2015
- Qt5101
dependencies:
- VS2015-Qt-5.10.1-x32
artifacts:
paths:
- rel/*.exe
Deploy:VS2017-Qt-5.10.1:
stage: Deploy
only:
......
......@@ -47,17 +47,17 @@ elif [ "$LANGUAGE" == "C++11" ]; then
BUILDPATH="$BUILDPATH-cpp11"
fi
if [ "$QTVERSION" == "QT4" ]; then
echo "Using QT4";
OPTIONS="$OPTIONS -DFORCE_QT4=TRUE "
BUILDPATH="$BUILDPATH-qt4"
elif [ "$QTVERSION" == "QT5" ]; then
if [ "$QTVERSION" == "QT5" ]; then
echo "Using 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"
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
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"
elif [ "$QTVERSION" == "QT5.9.0" ]; then
echo "Using QT5.9.0";
BUILDPATH="$BUILDPATH-qt5.9.0"
OPTIONS="$OPTIONS -DFORCE_QT4=FALSE -DQWT6_INCLUDE_DIR=~/sw/qwt-6.1.3-qt5.9.0/include -DQWT6_LIBRARY_DIR=~/sw/qwt-6.1.3-qt5.9.0/lib -DQWT6_LIBRARY=~/sw/qwt-6.1.3-qt5.9.0/lib/libqwt.so -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64"
fi
\ No newline at end of file
fi
......@@ -20,9 +20,9 @@ set( CMAKE_CXX_STANDARD 11 )
# ACG Environment default settings
# This is ugly but currently we need to work around the default installed 5.3 on debian
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ )
if ( EXISTS /ACG/acgdev/gcc-x86_64/qt-5.11.2/5.11.2/gcc_64 )
# Default to this install path for QT%_INSTALL_DIR
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.10.1/5.10.1/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment" )
set (QT5_INSTALL_PATH /ACG/acgdev/gcc-x86_64/qt-5.11.2/5.11.2/gcc_64/ CACHE PATH "Qt5 install path set for ACG environment using QT 5.11.2" )
endif()
if ( WIN32 )
......
Subproject commit 19dd8917198fec77a14515c02598c39e218be830
Subproject commit 82abcabb72e2ab9138624e2b11ff99961d4f9b1a
Subproject commit 4e37c90c6a57577d52df4b76b9cc1b3c97f86284
Subproject commit 8661a23c41714fe780dd34ebeb5e8a11b339b04b
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