Skip to content

Commit d3edfa6

Browse files
committed
Fix appveyor, remove MinGW because of Qt6
1 parent 40aae14 commit d3edfa6

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

.appveyor.yml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,25 @@ clone_depth: 5
22

33
environment:
44
matrix:
5-
- GENERATOR : "Visual Studio 16 2019"
5+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
6+
GENERATOR : "Visual Studio 16 2019"
7+
ARCHITECTURE : "-A Win32"
8+
QTDIR: C:\Qt\5.15\msvc2019
9+
QT_MAJOR: 5
10+
PLATFORM: Win32
11+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
12+
GENERATOR : "Visual Studio 16 2019"
613
ARCHITECTURE : "-A x64"
7-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
8-
QTDIR: C:\Qt\5.15.2\msvc2019_64
14+
QTDIR: C:\Qt\6.2.2\msvc2019_64
15+
QT_MAJOR: 6
916
PLATFORM: x64
10-
- GENERATOR : "Visual Studio 15 2017"
11-
ARCHITECTURE : ""
12-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
13-
QTDIR: C:\Qt\5.15.2\msvc2017
14-
PLATFORM: Win32
15-
- GENERATOR : "MinGW Makefiles"
16-
ARCHITECTURE : ""
17-
QTDIR: C:\Qt\5.11.3\mingw53_32
18-
PLATFORM: x86
19-
CMAKE_CXX_FLAGS_INIT: -DCATCH_CONFIG_NO_CPP11_TO_STRING
2017

2118
configuration:
2219
- Release
2320

2421
install:
2522
- set PATH=%QTDIR%\bin;%PATH%
26-
- set Qt5_DIR=%QTDIR%\lib\cmake\Qt5
27-
- set PATH=C:\MinGW\bin;C:\MinGW\msys\1.0;%PATH%
28-
- set PATH=C:\Qt\Tools\mingw530_32;%PATH%
23+
- set Qt%QT_MAJOR%_DIR=%QTDIR%\lib\cmake\Qt%QT_MAJOR%
2924
- set PATH=%PATH:C:\Program Files\Git\usr\bin=% # trick to remove sh.exe
3025

3126
before_build:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ find_package(Qt6
4646
)
4747

4848
if (NOT Qt6_FOUND)
49-
find_package(Qt5 5.15
49+
find_package(Qt5 5.13
5050
COMPONENTS
5151
Core
5252
Widgets

0 commit comments

Comments
 (0)