Use the new travis containers

.travis.yml

@@ -1,15 +1,27 @@
 language: cpp
 
+sudo: false
+
+cache:
+  directories:
+    - $HOME/itpp
+
 compiler:
   - gcc
 
-before_install:
+addons:
-  - sudo apt-get update -qq
+  apt:
-  - sudo apt-get install -y libsndfile1-dev libfftw3-dev liblapack3gf libblas3gf
+    packages:
+      - libsndfile1-dev
+      - libfftw3-dev
+      - liblapack3gf
+      - libblas3gf
 
-install: ./travis_deps.sh
+install:
+  - bash travis_deps.sh
 
 before_script:
+  - export CMAKE_PREFIX_PATH=$HOME/mbelib:$HOME/itpp
   - mkdir build
   - cd build
   - cmake ..

travis_deps.sh

@@ -2,23 +2,25 @@
 set -ex
 
 # Install mbelib
-cd /tmp
+wget https://github.com/szechyjs/mbelib/archive/master.tar.gz -O mbelib.tar.gz
-wget https://github.com/szechyjs/mbelib/archive/master.tar.gz -O /tmp/mbelib.tar.gz
 tar -xzf mbelib.tar.gz
 cd mbelib-master
 mkdir build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+cmake -DCMAKE_INSTALL_PREFIX=$HOME/mbelib ..
 make
-sudo make install
+make install
 
 # Install IT++ from SF
-cd /tmp
+if [ ! -d "$HOME/itpp/lib" ]; then
-wget http://sourceforge.net/projects/itpp/files/itpp/4.3.1/itpp-4.3.1.tar.gz/download -O /tmp/itpp-4.3.1.tar.gz
+  wget http://sourceforge.net/projects/itpp/files/itpp/4.3.1/itpp-4.3.1.tar.gz/download -O itpp-4.3.1.tar.gz
-tar -xzf itpp-4.3.1.tar.gz
+  tar -xzf itpp-4.3.1.tar.gz
-cd itpp-4.3.1
+  cd itpp-4.3.1
-mkdir build
+  mkdir build
-cd build
+  cd build
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  cmake -DCMAKE_INSTALL_PREFIX=$HOME/itpp ..
-make
+  make
-sudo make install
+  make install
+else
+  echo 'Using cached itpp.';
+fi