Skip to content

Commit c53be0e

Browse files
VSRoninVSRonin
authored
Modernised CMake build files and CI configs (#185)
* Modernised CMake build files and CI configs Fixed include formats * Fixed build errors and warnings * Fixes to allow CMake find_package
1 parent 6a39395 commit c53be0e

16 files changed

+554
-305
lines changed

‎.appveyor.yml‎

Lines changed: 31 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,44 @@
1-
version: '2.3.2.{build}'
1+
version: '{build}'
22
branches:
33
only:
44
- master
55

6-
image: Visual Studio 2015
7-
clone_depth: 1
6+
image: Visual Studio 2017
7+
88
environment:
99
global:
1010
# Appveyor doesn't have Qt 12 yet
11-
LatestLTSQtVersion: 5.9
12-
LatestQtVersion: 5.11
11+
LatestQtVersion: 5.13
1312
matrix:
14-
# Latest version of Qt, dll, 64bit, MSVC 2015, qmake
15-
- QT5: C:\Qt\%LatestQtVersion%\msvc2015_64
16-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
17-
targetPlatform: amd64
18-
use_mingw: "false"
19-
use_static: "false"
20-
use_cmake: "false"
2113
# 32 bit builds
2214
# MSVC 2015 builds
2315
# Dynamic Library builds
2416
# LTS version of Qt, dll, 32bit, MSVC 2015, qmake
25-
- QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
26-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
17+
- QT5: C:\Qt\%LatestQtVersion%\msvc2017
18+
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
2719
targetPlatform: x86
2820
use_mingw: "false"
2921
use_static: "false"
3022
use_cmake: "false"
3123
# LTS version of Qt, dll, 32bit, MSVC 2015, cmake
32-
- QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
33-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
24+
- QT5: C:\Qt\%LatestQtVersion%\msvc2017
25+
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
3426
targetPlatform: x86
3527
use_mingw: "false"
3628
use_static: "false"
3729
use_cmake: "true"
3830
# end Dynamic Library builds
3931
# Static Library builds
4032
# LTS version of Qt, static, 32bit, MSVC 2015, qmake
41-
- QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
42-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
33+
- QT5: C:\Qt\%LatestQtVersion%\msvc2017
34+
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
4335
targetPlatform: x86
4436
use_mingw: "false"
4537
use_static: "true"
4638
use_cmake: "false"
4739
# LTS version of Qt, static, 32bit, MSVC 2015, cmake
48-
- QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
49-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
40+
- QT5: C:\Qt\%LatestQtVersion%\msvc2017
41+
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
5042
targetPlatform: x86
5143
use_mingw: "false"
5244
use_static: "true"
@@ -56,31 +48,31 @@ environment:
5648
# MinGW builds
5749
# Dynamic Library builds
5850
# LTS version of Qt, dll, 32bit, MinGW, qmake
59-
- QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
60-
COMPILER: C:\Qt\Tools\mingw530_32
51+
- QT5: C:\Qt\%LatestQtVersion%\mingw73_32
52+
COMPILER: C:\Qt\Tools\mingw730_32
6153
targetPlatform: x86
6254
use_mingw: "true"
6355
use_static: "false"
6456
use_cmake: "false"
6557
# LTS version of Qt, dll, 32bit, MinGW, cmake
66-
- QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
67-
COMPILER: C:\Qt\Tools\mingw530_32
58+
- QT5: C:\Qt\%LatestQtVersion%\mingw73_32
59+
COMPILER: C:\Qt\Tools\mingw730_32
6860
targetPlatform: x86
6961
use_mingw: "true"
7062
use_static: "false"
7163
use_cmake: "true"
7264
# end Dynamic Library builds
7365
# Static Library builds
7466
# LTS version of Qt, static, 32bit, MinGW, qmake
75-
- QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
76-
COMPILER: C:\Qt\Tools\mingw530_32
67+
- QT5: C:\Qt\%LatestQtVersion%\mingw73_32
68+
COMPILER: C:\Qt\Tools\mingw730_32
7769
targetPlatform: x86
7870
use_mingw: "true"
7971
use_static: "true"
8072
use_cmake: "false"
8173
# LTS version of Qt, static, 32bit, MinGW, cmake
82-
- QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
83-
COMPILER: C:\Qt\Tools\mingw530_32
74+
- QT5: C:\Qt\%LatestQtVersion%\mingw73_32
75+
COMPILER: C:\Qt\Tools\mingw730_32
8476
targetPlatform: x86
8577
use_mingw: "true"
8678
use_static: "true"
@@ -92,31 +84,31 @@ environment:
9284
# MSVC 2015 builds
9385
# Dynamic Library builds
9486
# LTS version of Qt, dll, 64bit, MSVC 2015, qmake
95-
- QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
96-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
87+
- QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
88+
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
9789
targetPlatform: amd64
9890
use_mingw: "false"
9991
use_static: "false"
10092
use_cmake: "false"
10193
# LTS version of Qt, dll, 64bit, MSVC 2015, cmake
102-
- QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
103-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
94+
- QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
95+
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
10496
targetPlatform: amd64
10597
use_mingw: "false"
10698
use_static: "false"
10799
use_cmake: "true"
108100
# end Dynamic Library builds
109101
# Static Library builds
110102
# LTS version of Qt, static, 64bit, MSVC 2015, qmake
111-
- QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
112-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
103+
- QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
104+
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
113105
targetPlatform: amd64
114106
use_mingw: "false"
115107
use_static: "true"
116108
use_cmake: "false"
117109
# LTS version of Qt, static, 64bit, MSVC 2015, cmake
118-
- QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
119-
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
110+
- QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
111+
COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
120112
targetPlatform: amd64
121113
use_mingw: "false"
122114
use_static: "true"
@@ -129,19 +121,18 @@ matrix:
129121
fast_finish: true
130122

131123
before_build:
132-
- set PATH=%COMPILER%\bin;%QT5%\bin;%PATH%
133124
- set originalWD=%CD%
134125
- call "%QT5%\bin\qtenv2.bat"
135-
- cd %originalWD%
126+
- cd /D %originalWD%
136127
- if %use_mingw%==false call "%COMPILER%\vcvarsall.bat" %targetPlatform%
137128
- if %use_static%==true (set USESTATIC=ON) else (set USESTATIC=OFF)
138129
- if %use_mingw%==true (set CMAKEGENERATOR="MinGW Makefiles") else (set CMAKEGENERATOR="NMake Makefiles")
139130
- if %use_mingw%==true (set MAKEENGINE=mingw32-make) else (set MAKEENGINE=nmake)
140131
- if %use_mingw%==true set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
141132

142133
build_script:
143-
- if %use_cmake%==true mkdir .\build
144-
- if %use_cmake%==true cd .\build
134+
- if %use_cmake%==true mkdir build
135+
- if %use_cmake%==true cd build
145136
- if %use_cmake%==true cmake --version
146137
- if %use_cmake%==true cmake -G %CMAKEGENERATOR% -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DBUILD_STATIC=%USESTATIC% -DCMAKE_INSTALL_PREFIX="./installed" ../
147138
- if %use_cmake%==true cmake --build .

‎.travis.yml‎

Lines changed: 110 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ language: cpp
22
# gcc is clang on mac
33
compiler: gcc
44

5-
git:
6-
depth: 1
7-
85
matrix:
96
fast_finish: true
107
include:
@@ -21,74 +18,152 @@ matrix:
2118
packages:
2219
- qt55base
2320
- qt55tools
24-
- gcc-6
25-
- g++-6
26-
- libc6-i386
21+
- gcc-9
22+
- g++-9
2723
script:
2824
- PATH="/opt/qt55/bin:$PATH"
29-
- CXX="g++-6"
30-
- CC="gcc-6"
25+
- CXX="g++-9"
26+
- CC="gcc-9"
3127
- qt55-env.sh
3228
- qmake
3329
- make
3430
- make install
3531
- name: Ubuntu qmake dll
3632
os: linux
37-
dist: xenial
33+
dist: bionic
3834
group: stable
35+
services:
36+
- xvfb
37+
compiler: gcc
3938
addons:
4039
apt:
4140
sources:
4241
- ubuntu-toolchain-r-test
43-
- sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
42+
- sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
4443
update: true
4544
packages:
46-
- qt512base
47-
- qt512tools
48-
- gcc-6
49-
- g++-6
45+
- qt514base
46+
- qt514tools
47+
- gcc-9
48+
- g++-9
5049
- libc6-i386
5150
- libgl-dev
5251
- libgl1-mesa-dev
5352
- mesa-common-dev
5453
script:
55-
- PATH="/opt/qt512/bin:$PATH"
56-
- CXX="g++-6"
57-
- CC="gcc-6"
58-
- qt512-env.sh
54+
- PATH="/opt/qt514/bin:$PATH"
55+
- CXX="g++-9"
56+
- CC="gcc-9"
57+
- qt514-env.sh
5958
- qmake
6059
- make
6160
- make install
6261
- name: Ubuntu qmake static
6362
os: linux
64-
dist: xenial
63+
dist: bionic
6564
group: stable
65+
services:
66+
- xvfb
67+
compiler: gcc
6668
addons:
6769
apt:
6870
sources:
6971
- ubuntu-toolchain-r-test
70-
- sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
72+
- sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
7173
update: true
7274
packages:
73-
- qt512base
74-
- qt512tools
75-
- gcc-6
76-
- g++-6
75+
- qt514base
76+
- qt514tools
77+
- gcc-9
78+
- g++-9
7779
- libc6-i386
7880
- libgl-dev
7981
- libgl1-mesa-dev
8082
- mesa-common-dev
8183
script:
82-
- PATH="/opt/qt512/bin:$PATH"
83-
- CXX="g++-6"
84-
- CC="gcc-6"
85-
- qt512-env.sh
84+
- PATH="/opt/qt514/bin:$PATH"
85+
- CXX="g++-9"
86+
- CC="gcc-9"
87+
- qt514-env.sh
8688
- qmake "CONFIG+=adsBuildStatic"
8789
- make
8890
- make install
91+
- name: Ubuntu CMake dll
92+
os: linux
93+
dist: bionic
94+
group: stable
95+
services:
96+
- xvfb
97+
compiler: gcc
98+
addons:
99+
apt:
100+
sources:
101+
- ubuntu-toolchain-r-test
102+
- sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
103+
update: true
104+
packages:
105+
- qt514base
106+
- qt514tools
107+
- gcc-9
108+
- g++-9
109+
- libc6-i386
110+
- libgl-dev
111+
- libgl1-mesa-dev
112+
- mesa-common-dev
113+
script:
114+
- PATH="/opt/qt514/bin:$PATH"
115+
- CXX="g++-9"
116+
- CC="gcc-9"
117+
- qt514-env.sh
118+
- mkdir ./build
119+
- cd ./build
120+
- cmake --version
121+
- cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_STATIC=OFF -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
122+
- cmake --build .
123+
- cmake --build . --target install
124+
- cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_STATIC=OFF -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_INSTALL_PREFIX="./installed" ../
125+
- cmake --build .
126+
- cmake --build . --target install
127+
- name: Ubuntu CMake Static
128+
os: linux
129+
dist: bionic
130+
group: stable
131+
services:
132+
- xvfb
133+
compiler: gcc
134+
addons:
135+
apt:
136+
sources:
137+
- ubuntu-toolchain-r-test
138+
- sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
139+
update: true
140+
packages:
141+
- qt514base
142+
- qt514tools
143+
- gcc-9
144+
- g++-9
145+
- libc6-i386
146+
- libgl-dev
147+
- libgl1-mesa-dev
148+
- mesa-common-dev
149+
script:
150+
- PATH="/opt/qt514/bin:$PATH"
151+
- CXX="g++-9"
152+
- CC="gcc-9"
153+
- qt514-env.sh
154+
- mkdir ./build
155+
- cd ./build
156+
- cmake --version
157+
- cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_STATIC=ON -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
158+
- cmake --build .
159+
- cmake --build . --target install
160+
- cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_STATIC=ON -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_INSTALL_PREFIX="./installed" ../
161+
- cmake --build .
162+
- cmake --build . --target install
89163
- name: macOS CMake dll
90164
os: osx
91-
osx_image: xcode10.1
165+
osx_image: xcode11.3
166+
compiler: clang
92167
addons:
93168
homebrew:
94169
packages:
@@ -107,7 +182,8 @@ matrix:
107182
- cmake --build . --target install
108183
- name: macOS CMake static
109184
os: osx
110-
osx_image: xcode10.1
185+
osx_image: xcode11.3
186+
compiler: clang
111187
addons:
112188
homebrew:
113189
packages:
@@ -126,7 +202,8 @@ matrix:
126202
- cmake --build . --target install
127203
- name: macOS qmake dll
128204
os: osx
129-
osx_image: xcode10.1
205+
osx_image: xcode11.3
206+
compiler: clang
130207
addons:
131208
homebrew:
132209
packages:
@@ -139,7 +216,8 @@ matrix:
139216
- make install
140217
- name: macOS qmake static
141218
os: osx
142-
osx_image: xcode10.1
219+
osx_image: xcode11.3
220+
compiler: clang
143221
addons:
144222
homebrew:
145223
packages:

0 commit comments

Comments
 (0)