Skip to content

Commit da2cf81

Browse files
committed
Fix CI
1 parent 5bab847 commit da2cf81

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ environment:
44
matrix:
55
- GENERATOR : "Visual Studio 15 2017 Win64"
66
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
7-
QTDIR: C:\Qt\5.11.2\msvc2017_64
7+
QTDIR: C:\Qt\5.12.1\msvc2017_64
88
PLATFORM: x64
99
- GENERATOR : "Visual Studio 15 2017"
1010
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
11-
QTDIR: C:\Qt\5.11.2\msvc2015
11+
QTDIR: C:\Qt\5.12.1\msvc2015
1212
PLATFORM: Win32
1313
- GENERATOR : "MinGW Makefiles"
14-
QTDIR: C:\Qt\5.11.2\mingw53_32
14+
QTDIR: C:\Qt\5.11.3\mingw53_32
1515
PLATFORM: x86
1616
CMAKE_CXX_FLAGS_INIT: -DCATCH_CONFIG_NO_CPP11_TO_STRING
1717

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ matrix:
2929
- os: osx
3030
osx_image: xcode8.3
3131
compiler: clang
32-
env: CMAKE_PREFIX_PATH=/usr/local/Cellar/qt/5.12.0:$CMAKE_PREFIX_PATH
32+
env: Qt5_DIR=/usr/local/opt/qt5/lib/cmake/Qt5
3333

3434
git:
3535
depth: 10
@@ -39,9 +39,9 @@ before_install:
3939
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi
4040
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq ; fi
4141
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install build-essential libgl1-mesa-dev ; fi
42+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -yqq install qt511base; source /opt/qt511/bin/qt511-env.sh; fi
4243
- if [[ "$QT" == "511" ]]; then sudo add-apt-repository ppa:beineri/opt-qt-5.11.2-xenial -y; fi
4344
- if [[ "$QT" == "511" ]]; then sudo apt-get update -qq; fi
44-
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -yqq install qt511base; source /opt/qt511/bin/qt511-env.sh; fi
4545

4646
script:
4747
- mkdir build

0 commit comments

Comments
 (0)