From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 24 Jul 2015 21:32:34 +0000 (+0200)
Subject: Try to fix the travis file
X-Git-Tag: v3_12~431
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b4c6ff368e22be5e90707f474eefb7ff18db2ac4?ds=sidebyside

Try to fix the travis file

- Remove some dependencies that I think I killed: transfig ghostscript texlive-font-utils
- Add -Denable_ns3 so that it gets searched
- Add an EOL at EOF
---

diff --git a/.travis.yml b/.travis.yml
index d2f926e23b..7df6d86156 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ compiler:
 #   - clang # does not work for us on debian stable (boost is too old there)
 before_install: 
    - sudo apt-get update  -qq
-   - sudo apt-get install -qq doxygen valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-dev transfig ghostscript texlive-font-utils libns3-dev ns3
+   - sudo apt-get install -y cmake doxygen valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-dev libboost-context-dev libns3-dev ns3
 script:
-   - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON . && make && ctest --output-on-failure --timeout 100
+   - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_ns3=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON . && make && ctest --output-on-failure --timeout 100
 branches:
   only:
      - master
@@ -24,4 +24,4 @@ notifications:
 os:
   - linux
   - osx
-  - windows
\ No newline at end of file
+  - windows