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

Wrong compiler

Browse Source
This commit is contained in:
Jan Möbius
2021-01-15 14:55:14 +01:00
parent 684d749201
commit 53d8207c0f
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.gitlab-ci.yml
View File

@@ -417,19 +417,19 @@ macos-cpp14-release:
# OS: Windows
# Architecture: x64
# Shared: TRUE
# VS Version: VS2017
# VS Version: VS2019
# Apps: {{APPS}}
build-VS2017-x64-shared-TRUE-apps:
build-VS2019-x64-shared-TRUE-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2017
- VS2019
- Qt5150
artifacts:
paths:
@@ -440,16 +440,16 @@ build-VS2017-x64-shared-TRUE-apps:
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
build-VS2017-x64-shared-TRUE-no-apps:
build-VS2019-x64-shared-TRUE-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
- VS2019
artifacts:
paths:
- build-release/*.exe
@@ -464,19 +464,19 @@ build-VS2017-x64-shared-TRUE-no-apps:
# OS: Windows
# Architecture: x64
# Shared: FALSE
# VS Version: VS2017
# VS Version: VS2019
# Apps: {{APPS}}
build-VS2017-x64-shared-FALSE-apps:
build-VS2019-x64-shared-FALSE-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2017
- VS2019
- Qt5150
artifacts:
paths:
@@ -487,16 +487,16 @@ build-VS2017-x64-shared-FALSE-apps:
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
build-VS2017-x64-shared-FALSE-no-apps:
build-VS2019-x64-shared-FALSE-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2017"
BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
- VS2019
artifacts:
paths:
- build-release/*.exe

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

@@ -2,8 +2,8 @@
# Windows tasks
# -----------------
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5150}
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5150}
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150}
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150}
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}