Skip to content

Commit

Permalink
[travis] Use clang for Qt5 builds (qgis#3275)
Browse files Browse the repository at this point in the history
To get warnings from different compilers
  • Loading branch information
m-kuhn authored Jul 5, 2016
1 parent 72f3f3c commit ab13c63
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
10 changes: 4 additions & 6 deletions ci/travis/linux/qt5/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down

0 comments on commit ab13c63

Please sign in to comment.