mirror of
https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
synced 2024-11-15 21:25:44 +08:00
Try to fix Qt6 build
This commit is contained in:
Uwe Kindler
parent
b0c8edbd82
commit
a1c4812619
@ -11,42 +11,16 @@ environment:
|
|||||||
LatestQtVersion: 5.13
|
LatestQtVersion: 5.13
|
||||||
matrix:
|
matrix:
|
||||||
|
|
||||||
# 32 bit builds
|
|
||||||
# MSVC 2017 builds
|
|
||||||
# Dynamic Library builds
|
|
||||||
# LTS version of Qt, dll, 32bit, MSVC 2017, qmake
|
|
||||||
- QT: C:\Qt\%LatestQtVersion%\msvc2017
|
|
||||||
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
|
|
||||||
targetPlatform: x86
|
|
||||||
use_mingw: "false"
|
|
||||||
use_static: "false"
|
|
||||||
use_cmake: "false"
|
|
||||||
# LTS version of Qt, dll, 32bit, MSVC 2017, cmake
|
|
||||||
- QT: C:\Qt\%LatestQtVersion%\msvc2017
|
|
||||||
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
|
|
||||||
targetPlatform: x86
|
|
||||||
use_mingw: "false"
|
|
||||||
use_static: "false"
|
|
||||||
use_cmake: "true"
|
|
||||||
# end Dynamic Library builds
|
|
||||||
# Static Library builds
|
|
||||||
# LTS version of Qt, static, 32bit, MSVC 2017, qmake
|
|
||||||
- QT: C:\Qt\%LatestQtVersion%\msvc2017
|
|
||||||
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
|
|
||||||
targetPlatform: x86
|
|
||||||
use_mingw: "false"
|
|
||||||
use_static: "true"
|
|
||||||
use_cmake: "false"
|
|
||||||
# LTS version of Qt, static, 32bit, MSVC 2017, cmake
|
|
||||||
- QT: C:\Qt\%LatestQtVersion%\msvc2017
|
|
||||||
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
|
|
||||||
targetPlatform: x86
|
|
||||||
use_mingw: "false"
|
|
||||||
use_static: "true"
|
|
||||||
use_cmake: "true"
|
|
||||||
# end Static Library builds
|
|
||||||
# end MSVC 2017 builds
|
|
||||||
|
|
||||||
|
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
||||||
|
QT: C:\Qt\6.0.0\msvc2019_64
|
||||||
|
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build
|
||||||
|
targetPlatform: amd64
|
||||||
|
use_mingw: "false"
|
||||||
|
use_static: "false"
|
||||||
|
use_cmake: "false"
|
||||||
|
|
||||||
|
# 32 bit builds
|
||||||
# MinGW builds
|
# MinGW builds
|
||||||
# Dynamic Library builds
|
# Dynamic Library builds
|
||||||
# LTS version of Qt, dll, 32bit, MinGW, qmake
|
# LTS version of Qt, dll, 32bit, MinGW, qmake
|
||||||
@ -81,6 +55,40 @@ environment:
|
|||||||
use_cmake: "true"
|
use_cmake: "true"
|
||||||
# end Static Library builds
|
# end Static Library builds
|
||||||
# end MinGW builds
|
# end MinGW builds
|
||||||
|
# MSVC 2017 builds
|
||||||
|
# Dynamic Library builds
|
||||||
|
# LTS version of Qt, dll, 32bit, MSVC 2017, qmake
|
||||||
|
- QT: C:\Qt\%LatestQtVersion%\msvc2017
|
||||||
|
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
|
||||||
|
targetPlatform: x86
|
||||||
|
use_mingw: "false"
|
||||||
|
use_static: "false"
|
||||||
|
use_cmake: "false"
|
||||||
|
# LTS version of Qt, dll, 32bit, MSVC 2017, cmake
|
||||||
|
- QT: C:\Qt\%LatestQtVersion%\msvc2017
|
||||||
|
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
|
||||||
|
targetPlatform: x86
|
||||||
|
use_mingw: "false"
|
||||||
|
use_static: "false"
|
||||||
|
use_cmake: "true"
|
||||||
|
# end Dynamic Library builds
|
||||||
|
# Static Library builds
|
||||||
|
# LTS version of Qt, static, 32bit, MSVC 2017, qmake
|
||||||
|
- QT: C:\Qt\%LatestQtVersion%\msvc2017
|
||||||
|
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
|
||||||
|
targetPlatform: x86
|
||||||
|
use_mingw: "false"
|
||||||
|
use_static: "true"
|
||||||
|
use_cmake: "false"
|
||||||
|
# LTS version of Qt, static, 32bit, MSVC 2017, cmake
|
||||||
|
- QT: C:\Qt\%LatestQtVersion%\msvc2017
|
||||||
|
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
|
||||||
|
targetPlatform: x86
|
||||||
|
use_mingw: "false"
|
||||||
|
use_static: "true"
|
||||||
|
use_cmake: "true"
|
||||||
|
# end Static Library builds
|
||||||
|
# end MSVC 2017 builds
|
||||||
# end 32 bit builds
|
# end 32 bit builds
|
||||||
|
|
||||||
# 64 bit builds
|
# 64 bit builds
|
||||||
@ -118,16 +126,9 @@ environment:
|
|||||||
use_cmake: "true"
|
use_cmake: "true"
|
||||||
# end Static Library builds
|
# end Static Library builds
|
||||||
# end MSVC 2015 builds
|
# end MSVC 2015 builds
|
||||||
# MinGW builds
|
|
||||||
- QT: C:\Qt\6.0.0\mingw81_64
|
|
||||||
COMPILER: C:\Qt\Tools\mingw81_64
|
|
||||||
targetPlatform: amd64
|
|
||||||
use_mingw: "true"
|
|
||||||
use_static: "false"
|
|
||||||
use_cmake: "false"
|
|
||||||
# end MinGW builds
|
|
||||||
# end 64 bit builds
|
# end 64 bit builds
|
||||||
|
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
|
|
||||||
@ -139,9 +140,10 @@ before_build:
|
|||||||
- if %use_static%==true (set USESTATIC=ON) else (set USESTATIC=OFF)
|
- if %use_static%==true (set USESTATIC=ON) else (set USESTATIC=OFF)
|
||||||
- if %use_mingw%==true (set CMAKEGENERATOR="MinGW Makefiles") else (set CMAKEGENERATOR="NMake Makefiles")
|
- if %use_mingw%==true (set CMAKEGENERATOR="MinGW Makefiles") else (set CMAKEGENERATOR="NMake Makefiles")
|
||||||
- if %use_mingw%==true (set MAKEENGINE=mingw32-make) else (set MAKEENGINE=nmake)
|
- if %use_mingw%==true (set MAKEENGINE=mingw32-make) else (set MAKEENGINE=nmake)
|
||||||
- if %use_mingw%==true set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
|
- if %use_mingw%==true set PATH=%PATH%:C:\Program Files\Git\usr\bin;=%
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
|
- echo %PATH%
|
||||||
- if %use_cmake%==true mkdir build
|
- if %use_cmake%==true mkdir build
|
||||||
- if %use_cmake%==true cd build
|
- if %use_cmake%==true cd build
|
||||||
- if %use_cmake%==true cmake --version
|
- if %use_cmake%==true cmake --version
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user