Commit 7d439b39 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'VS2019_Qt150' into 'master'

Vs2019 qt5.15

See merge request !361
parents f00e5987 11ba9055
......@@ -400,6 +400,22 @@ VS2017-Qt-5.14.1:
paths:
- artifacts
VS2019-Qt-5.15.0:
stage: Build
script: "CI\\ci-windows-build.bat"
variables:
GIT_SUBMODULE_STRATEGY: recursive
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.0"
COMPILER: "VS2019"
tags:
- VS2019
- Qt5150
artifacts:
expire_in: 1 week
paths:
- artifacts
Test:VS2017-Qt-5.14.1:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
......@@ -419,6 +435,25 @@ Test:VS2017-Qt-5.14.1:
paths:
- rel/Testing/Temporary/LastTest.log
Test:VS2019-Qt-5.15.0:
stage: Test
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.0"
COMPILER: "VS2019"
STAGE2SCRIPT: ci-windows-test.bat
tags:
- VS2019
- Qt5150
dependencies:
- VS2019-Qt-5.15.0
needs: [VS2019-Qt-5.15.0]
artifacts:
paths:
- rel/Testing/Temporary/LastTest.log
Deploy:VS2017-Qt-5.14.1:
stage: Deploy
only:
......@@ -440,6 +475,28 @@ Deploy:VS2017-Qt-5.14.1:
artifacts:
paths:
- rel/*.exe
Deploy:VS2019-Qt-5.15.0:
stage: Deploy
only:
- master
- unstable
script: "artifacts\\CI\\ci-windows-bootstrap.bat"
variables:
GIT_STRATEGY: none
ARCHITECTURE: "x64"
QT_VERSION: "Qt5.15.9"
COMPILER: "VS2019"
STAGE2SCRIPT: ci-windows-deploy.bat
tags:
- VS2019
- Qt5150
dependencies:
- VS2019-Qt-5.15.0
needs: [VS2019-Qt-5.15.0]
artifacts:
paths:
- rel/*.exe
Mac-Cpp11:
stage: Build
......
......@@ -21,8 +21,11 @@ cd rel
::clear any old binary files
del *.exe
:: Output command line for easier debugging:
echo "C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%/%ARCHITECTURE%/%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
::invoke cmake
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%/%ARCHITECTURE%/%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
IF %errorlevel% NEQ 0 exit /b %errorlevel%
......
:: use 4 threads for parallel compilation of the project
set CL=/MP4
:: determine architecture and set variables
if "%ARCHITECTURE%" == "x64" (
set ARCHBITS=_64
set ARCH_VS= Win64
set STRING_ARCH=64-Bit
) else (
set ARCHBITS=
set ARCH_VS=
set STRING_ARCH=32-Bit
)
:: determine VS version and set variables
if "%COMPILER%" == "VS2015" (
set QT_COMPILERPREFIX=msvc2015
......@@ -9,6 +21,7 @@ set VS_COMPILERVERSION_SHORT=14
set VS_EDITION_YEAR=2015
set VS_EDITION_PATH= 14.0
)
if "%COMPILER%" == "VS2017" (
set QT_COMPILERPREFIX=msvc2017
set VS_COMPILERVERSION_LONG=15.0
......@@ -18,19 +31,20 @@ set VS_EDITION_YEAR=2017
set VS_EDITION_PATH=\2017\Professional
)
set BUILD_PLATFORM=%COMPILER%
:: determine architecture and set variables
if "%ARCHITECTURE%" == "x64" (
set ARCHBITS=_64
set ARCH_VS= Win64
set STRING_ARCH=64-Bit
) else (
set ARCHBITS=
if "%COMPILER%" == "VS2019" (
set QT_COMPILERPREFIX=msvc2019
set VS_COMPILERVERSION_LONG=16.0
set VS_COMPILERVERSION_SHORT=16
set VS_EDITION_YEAR=2019
set ARCH_VS=
set STRING_ARCH=32-Bit
::VS2017 default install path is different from other versions
set VS_EDITION_PATH=\2019\Professional
)
set BUILD_PLATFORM=%COMPILER%
set GENERATOR=Visual Studio %VS_COMPILERVERSION_SHORT% %VS_EDITION_YEAR%%ARCH_VS%
set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio%VS_EDITION_PATH%\Common7\IDE\devenv.com"
......@@ -67,6 +81,10 @@ if "%QT_VERSION%" == "Qt5.14.1" (
set QT_REV_LONG=5.14.1
set QT_REV=5.14.1
)
if "%QT_VERSION%" == "Qt5.15.0" (
set QT_REV_LONG=5.15.0
set QT_REV=5.15.0
)
set QT_SUFFIX=
set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPREFIX%%ARCHBITS%%QT_SUFFIX%
......@@ -75,8 +93,8 @@ set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPR
set LIBPATH_BASE=E:/libs/%COMPILER%
set CMAKE_WINDOWS_LIBS_DIR=E:/libs
:: check for gtest version 1.6 or 1.7 use the highest found version
for /l %%x in (6, 1, 7) do (
:: check for gtest version 1.6 or 1.10 use the highest found version
for /l %%x in (6, 1, 10) do (
if exist %LIBPATH_BASE%/%ARCHITECTURE%/gtest-1.%%x.0 (
set GTESTVERSION=gtest-1.%%x.0
)
......
Subproject commit 21336bb19f137f5852a8b772e65544d8f5401bf3
Subproject commit 5fadffb2ace0399d329921e31815ecf62051e594
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment