[travis] Clang 3.8 for Qt4 builds

This commit is contained in:
Matthias Kuhn 2016-04-09 13:29:35 +02:00
parent 156721b380
commit 79e3e0e9f1
2 changed files with 9 additions and 7 deletions

View File

@ -3,7 +3,9 @@ matrix:
# QT4 based build with Python 2.7 // using container based builds and prebuild binary dependencies in osgeo4travis # QT4 based build with Python 2.7 // using container based builds and prebuild binary dependencies in osgeo4travis
- os: linux - os: linux
language: cpp language: cpp
env: QT_VERSION=4 env:
- QT_VERSION=4
- LLVM_VERSION=3.8
sudo: false sudo: false
cache: cache:
apt: true apt: true
@ -14,12 +16,12 @@ matrix:
postgresql: "9.4" postgresql: "9.4"
apt: apt:
sources: sources:
- llvm-toolchain-precise-3.6 - llvm-toolchain-precise-3.8
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- george-edison55-precise-backports # doxygen 1.8.3 - george-edison55-precise-backports # doxygen 1.8.3
packages: packages:
- bison - bison
- clang-3.6 - clang-3.8
- doxygen - doxygen
- flex - flex
- flip - flip

View File

@ -1,13 +1,13 @@
mkdir build mkdir build
cd build cd build
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-3.6 ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-${LLVM_VERSION}
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-3.6 ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERSION}
ccache -s ccache -s
export CXX="clang++-3.6" export CXX="clang++-${LLVM_VERSION}"
export CC="clang-3.6" export CC="clang-${LLVM_VERSION}"
export PATH=${HOME}/osgeo4travis/bin:${PATH} export PATH=${HOME}/osgeo4travis/bin:${PATH}
cmake --version cmake --version