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

Added cmake arguments to ci to force qt5

Browse Source
This commit is contained in:
Johannes Lenzen
2021-04-26 12:03:11 +02:00
parent 7cbe7f9085
commit 8fc13b8a1a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CI/Windows.bat
View File

@@ -25,12 +25,12 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
IF "%ARCHITECTURE%" == "x64" ( IF "%ARCHITECTURE%" == "x64" (
set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64 set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64 set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64 -DQT_VERSION=5
) )
IF "%ARCHITECTURE%" == "x32" ( IF "%ARCHITECTURE%" == "x32" (
set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015 set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015 set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015 -DQT_VERSION=5
) )
) )
@@ -43,7 +43,7 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
IF "%ARCHITECTURE%" == "x64" ( IF "%ARCHITECTURE%" == "x64" (
set QT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64 set QT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64 set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\Qt5.10.1\5.10.1\msvc2017_64 -DQT_VERSION=5
) )
) )
@@ -57,7 +57,7 @@ IF "%BUILD_PLATFORM%" == "VS2019" (
IF "%ARCHITECTURE%" == "x64" ( IF "%ARCHITECTURE%" == "x64" (
set QT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 set QT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 -DQT_VERSION=5
) )
) )

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

@@ -42,27 +42,27 @@ fi
if [ "$QTVERSION" == "qt5.13.0" ]; then if [ "$QTVERSION" == "qt5.13.0" ]; then
echo "Using QT5.13.0"; echo "Using QT5.13.0";
BUILDPATH="$BUILDPATH-qt5.13.0" BUILDPATH="$BUILDPATH-qt5.13.0"
OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.13.0/gcc_64 -DQT_VERSION=5"
elif [ "$QTVERSION" == "qt5.12.2" ]; then elif [ "$QTVERSION" == "qt5.12.2" ]; then
echo "Using QT5.12.2"; echo "Using QT5.12.2";
BUILDPATH="$BUILDPATH-qt5.12.2" BUILDPATH="$BUILDPATH-qt5.12.2"
OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.12.2/gcc_64 -DQT_VERSION=5"
elif [ "$QTVERSION" == "qt5.11.2" ]; then elif [ "$QTVERSION" == "qt5.11.2" ]; then
echo "Using QT5.11.2"; echo "Using QT5.11.2";
BUILDPATH="$BUILDPATH-qt5.11.2" BUILDPATH="$BUILDPATH-qt5.11.2"
OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.11.2/gcc_64 -DQT_VERSION=5"
elif [ "$QTVERSION" == "qt5.9.0" ]; then elif [ "$QTVERSION" == "qt5.9.0" ]; then
echo "Using QT5.9.0"; echo "Using QT5.9.0";
BUILDPATH="$BUILDPATH-qt5.9.0" BUILDPATH="$BUILDPATH-qt5.9.0"
OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.9/gcc_64" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.9/gcc_64 -DQT_VERSION=5"
elif [ "$QTVERSION" == "qt5.13.2" ]; then elif [ "$QTVERSION" == "qt5.13.2" ]; then
echo "Using QT5.13.2"; echo "Using QT5.13.2";
BUILDPATH="$BUILDPATH-qt5.13.2" BUILDPATH="$BUILDPATH-qt5.13.2"
OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.13.2/gcc_64 -DQT_VERSION=5"
elif [ "$QTVERSION" == "qt5.15.1" ]; then elif [ "$QTVERSION" == "qt5.15.1" ]; then
echo "Using QT5.15.1"; echo "Using QT5.15.1";
BUILDPATH="$BUILDPATH-qt5.15.1" BUILDPATH="$BUILDPATH-qt5.15.1"
OPTIONS="$OPTIONS -DQT5_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64" OPTIONS="$OPTIONS -DQT_INSTALL_PATH=~/sw/Qt/5.15.1/gcc_64 -DQT_VERSION=5"
fi fi
#===================================== #=====================================