From 54e3c8ae3676d433323f7acac7cd7f5fd2df7ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 21 Sep 2021 15:08:54 +0200 Subject: [PATCH] Set path for qt in linux ci --- CI/ci-linux-prepare.sh | 5 +++++ CI/gitlab-ci/windows.yml | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh index 085bfbca..b3120761 100755 --- a/CI/ci-linux-prepare.sh +++ b/CI/ci-linux-prepare.sh @@ -76,8 +76,13 @@ elif [ "$QTVERSION" == "qt6.0.3" ]; then echo "Using QT6.0.3"; BUILDPATH="$BUILDPATH-qt6.0.3" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.3/gcc_64 -DQT_VERSION=6" +elif [ "$QTVERSION" == "qt6.1.2" ]; then + echo "Using QT6.0.3"; + BUILDPATH="$BUILDPATH-qt6.1.2" + OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.1.2/gcc_64 -DQT_VERSION=6" fi + #===================================== # Color Settings: #===================================== diff --git a/CI/gitlab-ci/windows.yml b/CI/gitlab-ci/windows.yml index dcf0da73..dc8cebc3 100644 --- a/CI/gitlab-ci/windows.yml +++ b/CI/gitlab-ci/windows.yml @@ -5,8 +5,5 @@ {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt612} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt612} -{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150} -{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150} - {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}