Attempt to fix travis build

This commit is contained in:
Tim Warren 2015-10-23 16:15:30 -04:00
parent 09d99c8a1f
commit e9d1d60af2

View File

@ -1,19 +1,19 @@
sudo: required sudo: false #required
language: cpp language: cpp
before_install: before_install:
# Define TRAVIS variable for workarounds # Define TRAVIS variable for workarounds
- export CXXFLAGS="$CXXFLAGS -DTRAVIS" - export CXXFLAGS="$CXXFLAGS -DTRAVIS"
install: #install:
- sudo apt-get install -qq libwxgtk3.0-dev libwxgtk3.0-0 libssh2-1-dev # - sudo apt-get install -qq libwxgtk3.0-dev libwxgtk3.0-0 libssh2-1-dev
- if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 98; fi # - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 98; fi
# Build with both gcc and clang # Build with both gcc and clang
compiler: compiler:
- gcc - gcc
- clang - clang
addons: addons:
apt: apt:
sources: sources:
@ -22,5 +22,8 @@ addons:
- gcc-4.8 - gcc-4.8
- g++-4.8 - g++-4.8
- clang - clang
- libwxgtk3.0-dev
- libwxgtk3.0-0
- libssh2-1-dev
script: make clean run-tests script: make clean run-tests