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

First VS2017 try

Browse Source
This commit is contained in:
Jan Möbius
2018-04-16 13:30:55 +02:00
parent 138e6983bf
commit 1f0ecef421
2 changed files with 119 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
.gitlab-ci.yml
View File

@@ -44,6 +44,111 @@ cppcheck:
paths:
- cppcheck.log
#VS2015-64-bit-shared-apps:
# variables:
# BUILD_PLATFORM: "VS2015"
# ARCHITECTURE: "x64"
# SHARED: "TRUE"
# APPS: "ON"
# script: "CI\\Windows.bat"
# tags:
# - VS2015
# artifacts:
# paths:
# - build-release/*.exe
VS2017-64-bit-shared-no-apps:
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
#VS2015-32-bit-shared-apps:
# variables:
# BUILD_PLATFORM: "VS2015"
# ARCHITECTURE: "x32"
# SHARED: "TRUE"
# APPS: "ON"
# script: "CI\\Windows.bat"
# tags:
# - VS2015
# artifacts:
# paths:
# - build-release/*.exe
VS2017-32-bit-shared-no-apps:
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x32"
SHARED: "TRUE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
#VS2015-64-bit-static-apps:
# variables:
# BUILD_PLATFORM: "VS2015"
# ARCHITECTURE: "x64"
# SHARED: "FALSE"
# APPS: "ON"
# script: "CI\\Windows.bat"
# tags:
# - VS2015
# artifacts:
# paths:
# - build-release/*.exe
VS2017-64-bit-static-no-apps:
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x64"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
#VS2015-32-bit-static-apps:
# variables:
# BUILD_PLATFORM: "VS2015"
# ARCHITECTURE: "x32"
# SHARED: "FALSE"
# APPS: "ON"
# script: "CI\\Windows.bat"
# tags:
# - VS2015
# artifacts:
# paths:
# - build-release/*.exe
VS2017-32-bit-static-no-apps:
variables:
BUILD_PLATFORM: "VS2017"
ARCHITECTURE: "x32"
SHARED: "FALSE"
APPS: "OFF"
script: "CI\\Windows.bat"
tags:
- VS2017
artifacts:
paths:
- build-release/*.exe
VS2015-64-bit-shared-apps:
variables:
BUILD_PLATFORM: "VS2015"

14
CI/Windows.bat
View File

@@ -69,6 +69,20 @@ IF "%BUILD_PLATFORM%" == "VS2015" (
)
IF "%BUILD_PLATFORM%" == "VS2017" (
set LIBPATH=E:\libs\VS2017
set GTESTVERSION=gtest-1.7.0
set GENERATOR=Visual Studio 15%ARCH_VS%
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 15.0\Common7\IDE\devenv.com"
set QT_VERSION=
IF "%ARCHITECTURE%" == "x64" (
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
)
)
IF "%APPS%" == "ON" (
set STRING_APPS=