Revert "please cmake, could you tell us your compiler arguments?"

[simgrid.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8572822..3246b7f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,24 @@
 language: cpp
 compiler:
    - gcc
-#   - clang # does not work for us on debian stable (boost is too old there)
-before_install: 
+   - clang
+addons:
+  apt: # Get recent versions of the compiler, even on Ubuntu Precise
+      sources:
+      - ubuntu-toolchain-r-test
+      packages:
+      - gcc-4.7
+      - g++-4.7
+      - clang
+# Install libboost-chrono1.48-dev to get boost 1.48 on Ubuntu Precise. What we really want is libboost-dev libboost-all-dev
+# Still need sudo for update-alternatives
+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
+   - sudo apt-get install -y cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-chrono1.48-dev libns3-dev ns3
+   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50
+   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50
 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 +36,4 @@ notifications:
 os:
   - linux
   - osx
-  - windows
\ No newline at end of file
+  - windows