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

Merge branch 'VS2019' into 'master'

Browse Source 
Vs2019

See merge request OpenMesh/OpenMesh!292
This commit is contained in:
Jan Möbius
2021-01-19 16:34:31 +01:00
parent 715430cc24 53d8207c0f
commit 7bbc33f65f
3 changed files with 111 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
.gitlab-ci.yml
View File

@@ -412,6 +412,101 @@ macos-cpp14-release:
# Windows tasks
# -----------------
#------------- Job Informations:
# Type: Build+Test: Release
# OS: Windows
# Architecture: x64
# Shared: TRUE
# VS Version: VS2019
# Apps: {{APPS}}
build-VS2019-x64-shared-TRUE-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2019
- Qt5150
artifacts:
paths:
- build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
build-VS2019-x64-shared-TRUE-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2019
artifacts:
paths:
- build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
#------------- Job Informations:
# Type: Build+Test: Release
# OS: Windows
# Architecture: x64
# Shared: FALSE
# VS Version: VS2019
# Apps: {{APPS}}
build-VS2019-x64-shared-FALSE-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "ON"
script: "CI\\Windows.bat"
tags:
- VS2019
- Qt5150
artifacts:
paths:
- build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
build-VS2019-x64-shared-FALSE-no-apps:
stage: build
variables:
BUILD_PLATFORM: "VS2019"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2019
artifacts:
paths:
- build-release/*.exe
reports:
junit:
- build-release/unittests/report.xml
- build-release/unittests/report-customvec.xml
- build-release/unittests/report-doublevec.xml
#------------- Job Informations:
# Type: Build+Test: Release
# OS: Windows

13
CI/Windows.bat
View File

@@ -49,6 +49,19 @@ IF "%BUILD_PLATFORM%" == "VS2017" (
)
IF "%BUILD_PLATFORM%" == "VS2019" (
set LIBPATH=E:\libs\VS2019
set GTESTVERSION=gtest-1.10.0
set GENERATOR=Visual Studio 16 2019
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com"
IF "%ARCHITECTURE%" == "x64" (
set QT_INSTALL_PATH=E:\Qt\Qt5.15.0\5.15.0\msvc2019_64
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.15.0\5.15.0\msvc2019_64
)
)
IF "%APPS%" == "ON" (
set STRING_APPS=

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

@@ -2,6 +2,9 @@
# Windows tasks
# -----------------
{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}