Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set path for qt in linux ci

Browse Source
This commit is contained in:
Jan Möbius
2021-09-21 15:08:54 +02:00
parent c204b4a553
commit 54e3c8ae36
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CI/ci-linux-prepare.sh
View File

@@ -76,8 +76,13 @@ elif [ "$QTVERSION" == "qt6.0.3" ]; then
echo "Using QT6.0.3"; echo "Using QT6.0.3";
BUILDPATH="$BUILDPATH-qt6.0.3" BUILDPATH="$BUILDPATH-qt6.0.3"
OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/6.0.3/gcc_64 -DQT_VERSION=6" 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 fi
#===================================== #=====================================
# Color Settings: # Color Settings:
#===================================== #=====================================

3
CI/gitlab-ci/windows.yml
View File

@@ -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=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=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=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}