mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-15 00:04:00 -04:00
[travis] Use clang for Qt5 builds (#3275)
To get warnings from different compilers
This commit is contained in:
parent
72f3f3c1dc
commit
ab13c63470
@ -75,7 +75,7 @@ matrix:
|
||||
postgresql: "9.4"
|
||||
apt:
|
||||
sources:
|
||||
# - llvm-toolchain-precise-3.8
|
||||
- llvm-toolchain-precise-3.8
|
||||
- ubuntu-toolchain-r-test
|
||||
- george-edison55-precise-backports # doxygen 1.8.3
|
||||
packages:
|
||||
@ -91,8 +91,7 @@ matrix:
|
||||
- txt2tags
|
||||
- xvfb
|
||||
- flip
|
||||
- gcc-6
|
||||
- g++-6
|
||||
- clang-3.8
|
||||
# OSX based build with QT4 and Python 2
|
||||
- os: osx
|
||||
env:
|
||||
|
@ -18,15 +18,13 @@ cd build
|
||||
|
||||
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-${LLVM_VERSION}
|
||||
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERSION}
|
||||
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/g++-6
|
||||
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/gcc-6
|
||||
|
||||
ccache -s
|
||||
|
||||
#export CXX="clang++-${LLVM_VERSION}"
|
||||
#export CC="clang-${LLVM_VERSION}"
|
||||
export CXX="g++-6"
|
||||
export CC="gcc-6"
|
||||
export CXX="clang++-${LLVM_VERSION}"
|
||||
export CC="clang-${LLVM_VERSION}"
|
||||
#export CXX="g++-6"
|
||||
#export CC="gcc-6"
|
||||
export PATH=${HOME}/osgeo4travis/bin:${PATH}
|
||||
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user