Skip to content

Commit

Permalink
[travis] Clang 3.8 for Qt5 buildss
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Apr 9, 2016
1 parent 79e3e0e commit e7c7f85
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Expand Up @@ -54,7 +54,9 @@ matrix:
# QT5 based build with Python 3 // using container based builds and prebuild binary dependencies in osgeo4travis
- os: linux
language: python # This lets us use newer python versions from virtualenv
env: QT_VERSION=5
env:
- QT_VERSION=5
- LLVM_VERSION=3.8
sudo: false
cache:
apt: true
Expand All @@ -66,7 +68,7 @@ matrix:
postgresql: "9.4"
apt:
sources:
- llvm-toolchain-precise-3.6
- llvm-toolchain-precise-3.8
- ubuntu-toolchain-r-test
- george-edison55-precise-backports # doxygen 1.8.3
packages:
Expand All @@ -81,7 +83,7 @@ matrix:
- txt2tags
- xvfb
- flip
- clang-3.6
- clang-3.8
# OSX based build with QT4 and Python 2
- os: osx

Expand Down
8 changes: 4 additions & 4 deletions ci/travis/linux/qt5/install.sh
@@ -1,13 +1,13 @@
mkdir 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-3.6
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang++-${LLVM_VERSION}
ln -s ${HOME}/osgeo4travis/bin/ccache ${HOME}/osgeo4travis/bin/clang-${LLVM_VERSION}

ccache -s

export CXX="clang++-3.6"
export CC="clang-3.6"
export CXX="clang++-${LLVM_VERSION}"
export CC="clang-${LLVM_VERSION}"
export PATH=${HOME}/osgeo4travis/bin:${PATH}
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/

Expand Down

0 comments on commit e7c7f85

Please sign in to comment.