From 1903647ad57631dc042470c7a65e6d1fd88432a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Chr=C3=A9tien?= <chretien.b@gmail.com>
Date: Thu, 3 Mar 2016 13:59:34 +0900
Subject: [PATCH] [travis] Fix install of Ipopt dependencies

---
 .travis     |  2 +-
 .travis.yml | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.travis b/.travis
index 7b21446..9b94f1a 160000
--- a/.travis
+++ b/.travis
@@ -1 +1 @@
-Subproject commit 7b214468603e42575da8265e61ebae69f9a81133
+Subproject commit 9b94f1a71af25624c9bab7f56dd39f455949ed5c
diff --git a/.travis.yml b/.travis.yml
index 0a4b935..2afd192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ sudo: required
 language: cpp
 env:
   global:
-  - APT_DEPENDENCIES="doxygen libltdl-dev libboost-all-dev liblog4cxx10-dev libblas-dev liblapack-dev libmumps-seq-dev gfortran"
+  - APT_DEPENDENCIES="doxygen libltdl-dev libboost-all-dev liblog4cxx10-dev"
   - GIT_DEPENDENCIES="roboptim/roboptim-core roboptim/roboptim-core-plugin-ipopt"
   - DEBSIGN_KEYID=5AE5CD75
   - PPA_URI="roboptim/ppa"
@@ -18,16 +18,6 @@ notifications:
   hipchat:
     rooms:
       secure: X+ZM9zdIE0uAXC6FcGszec+DYxgzkuNkwmDJmofwbTFFhzhoWQxu2EbvGnyBe06MVRzlfIisWBXUgln/dCxMTqbXy0jFxU5L2clQawUXQFtD17hgjeQ1ZO6wdBXqfFTbh1oWr6yKEvz1q2EE6FVEXGllejVVC4HTkynZPSFsukI=
-before_install:
-  - ./.travis/dependencies/eigen-3.2
-  - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then CC=gcc CXX=g++ ./.travis/dependencies/ipopt; fi
-  - ./.travis/run  before_install
-
-script:
-  - export LD_LIBRARY_PATH="/tmp/_ci/install/lib/roboptim-core/":$LD_LIBRARY_PATH; export CMAKE_ADDITIONAL_OPTIONS="-DTESTSUITE_SOLVER=ipopt";
-  - if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then ./.travis/run build; fi
-after_failure: ./.travis/run after_failure
-after_success: ./.travis/run after_success
 branches:
   only:
   - master
@@ -35,6 +25,15 @@ branches:
   - debian
   - travis
   - coverity_scan
+script:
+  - export LD_LIBRARY_PATH="/tmp/_ci/install/lib/roboptim-core/":$LD_LIBRARY_PATH; export CMAKE_ADDITIONAL_OPTIONS="-DTESTSUITE_SOLVER=ipopt";
+  - if [ "${COVERITY_SCAN_BRANCH}" != "1" ]; then ./.travis/run build; fi
+after_success: ./.travis/run after_success
+after_failure: ./.travis/run after_failure
+before_install:
+  - ./.travis/dependencies/eigen-3.2
+  - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then CC=gcc CXX=g++ ./.travis/dependencies/ipopt; fi
+  - ./.travis/run before_install
 
 matrix:
   allow_failures: