Skip to content

Commit ee616c2

Browse files
committed
fixed travis script
1 parent 7dd2a3c commit ee616c2

File tree

4 files changed

+77
-38
lines changed

4 files changed

+77
-38
lines changed

.travis.yml

Lines changed: 74 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,63 +8,74 @@ git:
88
matrix:
99
fast_finish: true
1010
include:
11-
- name: Ubuntu CMake dll
11+
- name: Ubuntu qmake dll
1212
os: linux
1313
dist: xenial
1414
group: stable
15-
cache: ccache
1615
addons:
1716
apt:
17+
sources:
18+
- ubuntu-toolchain-r-test
19+
- sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
20+
update: true
1821
packages:
19-
- qt5-default
20-
- qttools5-dev
21-
- qttools5-dev-tools
22+
- qt512base
23+
- qt512tools
24+
- gcc-6
25+
- g++-6
26+
- libc6-i386
27+
- libgl-dev
28+
- libgl1-mesa-dev
29+
- mesa-common-dev
2230
script:
23-
- mkdir .\build
24-
- cd build
25-
- cmake --version
26-
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
27-
- cmake --build .
28-
- cmake --build . --target install
29-
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
30-
- cmake --build .
31-
- cmake --build . --target install
32-
- name: Ubuntu CMake static
31+
- PATH="/opt/qt512/bin:$PATH"
32+
- CXX="g++-6"
33+
- CC="gcc-6"
34+
- qt512-env.sh
35+
- qmake
36+
- make
37+
- make install
38+
- name: Ubuntu qmake static
3339
os: linux
3440
dist: xenial
3541
group: stable
36-
cache: ccache
3742
addons:
3843
apt:
44+
sources:
45+
- ubuntu-toolchain-r-test
46+
- sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
47+
update: true
3948
packages:
40-
- qt5-default
41-
- qttools5-dev
42-
- qttools5-dev-tools
49+
- qt512base
50+
- qt512tools
51+
- gcc-6
52+
- g++-6
53+
- libc6-i386
54+
- libgl-dev
55+
- libgl1-mesa-dev
56+
- mesa-common-dev
4357
script:
44-
- mkdir .\build
45-
- cd build
46-
- cmake --version
47-
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
48-
- cmake --build .
49-
- cmake --build . --target install
50-
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
51-
- cmake --build .
52-
- cmake --build . --target install
53-
58+
- PATH="/opt/qt512/bin:$PATH"
59+
- CXX="g++-6"
60+
- CC="gcc-6"
61+
- qt512-env.sh
62+
- qmake "CONFIG+=adsBuildStatic"
63+
- make
64+
- make install
5465
- name: macOS CMake dll
5566
os: osx
5667
osx_image: xcode10.1
57-
cache: ccache
5868
addons:
5969
homebrew:
6070
packages:
61-
- ccache
6271
- qt
72+
update: true
6373
script:
64-
- mkdir .\build
74+
- PATH="/usr/local/opt/qt5/bin:$PATH"
75+
- mkdir -p build
6576
- cd build
6677
- cmake --version
67-
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
78+
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
6879
- cmake --build .
6980
- cmake --build . --target install
7081
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=OFF -DCMAKE_INSTALL_PREFIX="./installed" ../
@@ -73,23 +84,48 @@ matrix:
7384
- name: macOS CMake static
7485
os: osx
7586
osx_image: xcode10.1
76-
cache: ccache
7787
addons:
7888
homebrew:
7989
packages:
80-
- ccache
8190
- qt
91+
update: true
8292
script:
83-
- mkdir .\build
93+
- PATH="/usr/local/opt/qt5/bin:$PATH"
94+
- mkdir -p build
8495
- cd build
8596
- cmake --version
86-
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
97+
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_DEBUG_POSTFIX=_debug -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
8798
- cmake --build .
8899
- cmake --build . --target install
89100
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
90101
- cmake --build .
91102
- cmake --build . --target install
92-
103+
- name: macOS qmake dll
104+
os: osx
105+
osx_image: xcode10.1
106+
addons:
107+
homebrew:
108+
packages:
109+
- qt
110+
update: true
111+
script:
112+
- PATH="/usr/local/opt/qt5/bin:$PATH"
113+
- qmake
114+
- make
115+
- make install
116+
- name: macOS qmake static
117+
os: osx
118+
osx_image: xcode10.1
119+
addons:
120+
homebrew:
121+
packages:
122+
- qt
123+
update: true
124+
script:
125+
- PATH="/usr/local/opt/qt5/bin:$PATH"
126+
- qmake "CONFIG+=adsBuildStatic"
127+
- make
128+
- make install
93129
notifications:
94130
email: false
95131

demo/demo.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ TARGET = AdvancedDockingSystemDemo
44
DESTDIR = $${ADS_OUT_ROOT}/lib
55
QT += core gui widgets
66
CONFIG += c++11
7+
CONFIG += debug_and_release
78
DEFINES += QT_DEPRECATED_WARNINGS
89

910
adsBuildStatic {

example/example.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ TARGET = Example1
66
DESTDIR = $${ADS_OUT_ROOT}/lib
77
TEMPLATE = app
88
CONFIG += c++11
9+
CONFIG += debug_and_release
910
adsBuildStatic {
1011
DEFINES += ADS_STATIC
1112
}

src/src.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ADS_OUT_ROOT = $${OUT_PWD}/..
22
CONFIG += c++11
3+
CONFIG += debug_and_release
34
TARGET = $$qtLibraryTarget(qtadvanceddocking)
45
DEFINES += QT_DEPRECATED_WARNINGS
56
TEMPLATE = lib

0 commit comments

Comments
 (0)