mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-12-21 08:09:35 +08:00
travis: use GCC 6 in CMake builds
GCC 4.8.4 has a bug with system includes: it does not ignore warnings for files from system include directories. This breaks our Travis builds due to warnings in zlib.h.
This commit is contained in:
parent
3a87af7372
commit
8c589b8579
@ -55,7 +55,7 @@ addons:
|
|||||||
apt:
|
apt:
|
||||||
sources:
|
sources:
|
||||||
# sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
|
# sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
|
||||||
#- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
#- boost-latest
|
#- boost-latest
|
||||||
- sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
|
- sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
|
||||||
- sourceline: 'ppa:beineri/opt-qt551-trusty'
|
- sourceline: 'ppa:beineri/opt-qt551-trusty'
|
||||||
@ -74,6 +74,7 @@ addons:
|
|||||||
- qt55base
|
- qt55base
|
||||||
- qt55tools
|
- qt55tools
|
||||||
- ninja-build
|
- ninja-build
|
||||||
|
- [gcc-6, g++-6]
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
# only allow specific build for coverity scan, others will stop
|
# only allow specific build for coverity scan, others will stop
|
||||||
@ -95,6 +96,11 @@ before_install:
|
|||||||
|
|
||||||
# Qt 5
|
# Qt 5
|
||||||
PATH=/opt/qt55/bin:${PATH}
|
PATH=/opt/qt55/bin:${PATH}
|
||||||
|
|
||||||
|
if [ "$build_system" = "cmake" ]; then
|
||||||
|
COMPILER_VERSION=6
|
||||||
|
export CXX="${CXX}-${COMPILER_VERSION}" CC="${CC}-${COMPILER_VERSION}"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# print settings
|
# print settings
|
||||||
|
Loading…
Reference in New Issue
Block a user