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

VS2019 now compiles with qt6

Browse Source
This commit is contained in:
Johannes Lenzen
2021-07-27 10:59:39 +02:00
parent 822310ede3
commit 3e7385dd27
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -863,7 +863,7 @@ build-VS2019-x64-shared-TRUE-apps:
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2019 - VS2019
- Qt5150 - Qt612
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe
@@ -891,7 +891,7 @@ build-VS2019-x64-shared-FALSE-apps:
script: "CI\\Windows.bat" script: "CI\\Windows.bat"
tags: tags:
- VS2019 - VS2019
- Qt5150 - Qt612
artifacts: artifacts:
paths: paths:
- build-release/*.exe - build-release/*.exe

4
CI/Windows.bat
View File

@@ -56,8 +56,8 @@ IF "%BUILD_PLATFORM%" == "VS2019" (
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com" set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com"
IF "%ARCHITECTURE%" == "x64" ( IF "%ARCHITECTURE%" == "x64" (
set QT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 set QT_INSTALL_PATH=E:\Qt\6.1.2\msvc2019_64
set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 -DQT_VERSION=5 set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\6.1.2\msvc2019_64 -DQT_VERSION=6
) )
) )

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

@@ -2,8 +2,8 @@
# Windows tasks # Windows tasks
# ----------------- # -----------------
{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150} {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=Qt5150} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt612}
{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}