diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2015-10-29 15:24:58 +0000 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2015-10-29 15:24:58 +0000 |
| commit | f1db539da52b7287ae78886051cf831d99e1ce22 (patch) | |
| tree | 5c7df92793eb6a97439c9564c98fbe0f27c89f71 /.travis.yml | |
| parent | 5c9788e8b0895142442511fb942aa1b3d5f72d87 (diff) | |
travis: Use clang with libc++.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 52196c01..f5706983 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,8 @@ matrix: - CMAKE_OPTIONS="-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_SYSTEM_LIBRARY_PATH=/usr/lib32 -DENABLE_GUI=0" - compiler: clang env: - - APT_PACKAGES="libdwarf-dev libprocps3-dev" - - CMAKE_OPTIONS="-DENABLE_GUI=0" + - APT_PACKAGES="clang-3.6 libc++-dev libc++abi-dev libdwarf-dev libprocps3-dev qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev" + - CMAKE_OPTIONS="-DCMAKE_C_COMPILER=clang-3.6 -DCMAKE_CXX_COMPILER=clang++-3.6 -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DENABLE_GUI=1" - compiler: ": mingw32" env: - APT_REPOS="ppa:tobydox/mingw-x-trusty" @@ -35,9 +35,11 @@ matrix: before_install: - for APT_REPO in $APT_REPOS; do sudo add-apt-repository -y $APT_REPO; done +- if [ "$CXX" == "clang++" ]; then wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.6 main'; fi - sudo apt-get update -qq - if [ "$APT_PACKAGES" ]; then sudo apt-get install -qq -y $APT_PACKAGES; fi - if [ "$MINGW_ROOT" ]; then export PATH=$MINGW_ROOT/bin:$PATH; fi +- cmake --version script: - | |