Skip to content

Commit 092192f

Browse files
committed
(paceholder#257) Fix appveyor and travis
1 parent eff278c commit 092192f

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.appveyor.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ clone_depth: 5
22

33
environment:
44
matrix:
5-
- GENERATOR : "Visual Studio 15 2017 Win64"
6-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
7-
QTDIR: C:\Qt\5.12.2\msvc2017_64
5+
- GENERATOR : "Visual Studio 16 2019"
6+
ARCHITECTURE : "-A x64"
7+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
8+
QTDIR: C:\Qt\5.14.0\msvc2017_64
89
PLATFORM: x64
910
- GENERATOR : "Visual Studio 15 2017"
11+
ARCHITECTURE : ""
1012
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
11-
QTDIR: C:\Qt\5.12.2\msvc2017
13+
QTDIR: C:\Qt\5.13.2\msvc2017
1214
PLATFORM: Win32
1315
- GENERATOR : "MinGW Makefiles"
16+
ARCHITECTURE : ""
1417
QTDIR: C:\Qt\5.11.3\mingw53_32
1518
PLATFORM: x86
1619
CMAKE_CXX_FLAGS_INIT: -DCATCH_CONFIG_NO_CPP11_TO_STRING
@@ -30,7 +33,7 @@ before_build:
3033
- cd build
3134
- mkdir bin
3235
- set OUTPUT_DIR=%cd%\bin
33-
- cmake "-G%GENERATOR%"
36+
- cmake "-G%GENERATOR%" %ARCHITECTURE%
3437
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG="%OUTPUT_DIR%"
3538
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE="%OUTPUT_DIR%"
3639
-DCMAKE_CXX_FLAGS_INIT="%CMAKE_CXX_FLAGS_INIT%"

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: cpp
33
matrix:
44
include:
55
- os: osx
6-
osx_image: xcode8.3
6+
osx_image: xcode11.3
77
compiler: clang
88
env: Qt5_DIR=/usr/local/opt/qt5/lib/cmake/Qt5
99

0 commit comments

Comments
 (0)