From 3a69e22b540d0dbd3f062e43e114ebfdf44ce68f Mon Sep 17 00:00:00 2001
From: bhack <s.fabri@email.it>
Date: Fri, 12 Sep 2014 19:50:15 +0200
Subject: Add ppa for gflag and glog

---
 scripts/travis/travis_install.sh | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'scripts')

diff --git a/scripts/travis/travis_install.sh b/scripts/travis/travis_install.sh
index 15cafbe9..36c63b9d 100755
--- a/scripts/travis/travis_install.sh
+++ b/scripts/travis/travis_install.sh
@@ -6,6 +6,7 @@ set -e
 MAKE="make --jobs=$NUM_THREADS"
 
 # Install apt packages where the Ubuntu 12.04 default works for Caffe
+add-apt-repository -y ppa:tuleu/precise-backports
 apt-get -y update
 apt-get install \
     wget git curl \
@@ -14,7 +15,7 @@ apt-get install \
     libboost-dev libboost-system-dev libboost-python-dev libboost-thread-dev \
     libprotobuf-dev protobuf-compiler \
     libatlas-dev libatlas-base-dev \
-    libhdf5-serial-dev \
+    libhdf5-serial-dev libgflags-dev libgoogle-glog-dev \
     bc
 
 # Add a special apt-repository to install CMake 2.8.9 for CMake Caffe build,
@@ -26,35 +27,6 @@ if $WITH_CMAKE; then
   apt-get -y install cmake
 fi
 
-# Install glog
-GLOG_URL=https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz
-GLOG_FILE=/tmp/glog-0.3.3.tar.gz
-pushd .
-wget $GLOG_URL -O $GLOG_FILE
-tar -C /tmp -xzvf $GLOG_FILE
-rm $GLOG_FILE
-cd /tmp/glog-0.3.3
-./configure
-$MAKE
-$MAKE install
-popd
-
-# Install gflags
-GFLAGS_URL=https://github.com/schuhschuh/gflags/archive/master.zip
-GFLAGS_FILE=/tmp/gflags-master.zip
-pushd .
-wget $GFLAGS_URL -O $GFLAGS_FILE
-cd /tmp/
-unzip gflags-master.zip
-cd gflags-master
-mkdir build
-cd build
-export CXXFLAGS="-fPIC"
-cmake ..
-$MAKE VERBOSE=1
-$MAKE install
-popd
-
 # Install CUDA, if needed
 if $WITH_CUDA; then
   CUDA_URL=http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1204/x86_64/cuda-repo-ubuntu1204_6.0-37_amd64.deb
-- 
cgit v1.2.3