sync travis config files

.travis.yml

@@ -44,23 +44,25 @@ env:
   - PACKAGE='Triangulation_2 Triangulation_3 Union_find ' 
   - PACKAGE='Visibility_2 Voronoi_diagram_2 ' 
   - PACKAGE='Polyhedron_demo' 
+compiler: 
+  - clang-3.6
+  - gcc  
 install: 
+  - if [[ "$CXX" = "clang++" ]]; then export CXX=clang++-3.6 CC=clang-3.6; fi
 before_script: 
 - mkdir -p build 
 - cd build 
-- cmake -DCGAL_HEADER_ONLY=ON -DWITH_demos:BOOL=TRUE -DWITH_examples:BOOL=true -DWITH_tests:BOOL=TRUE -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG ..
+- cmake -DCGAL_HEADER_ONLY=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DWITH_demos:BOOL=TRUE -DWITH_examples:BOOL=true -DWITH_tests:BOOL=TRUE -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG .. 
 - make 
 - cd .. 
 script: 
 - cd ./.travis
 - bash -x -e ./build_package.sh $PACKAGE
-compiler:
-  - clang
-  - gcc
 addons: 
   apt:
     sources:
       - sourceline: 'ppa:ppsspp/cmake' 
+      - sourceline: 'ppa:hedges/qt5.5'
     packages:
       - clang-3.6
       - zsh
@@ -73,16 +75,14 @@ addons:
       - libmpfr-dev 
       - zlib1g-dev 
       - libeigen3-dev # too old 
-      - qtbase5-dev
-      - qtscript5-dev
-      - libqt5svg5-dev
-      - qttools5-dev
-      - qttools5-dev-tools
-      - libqt5opengl5-dev
-      - libqt5gui5
-      - libqt5widgets5
-      - libqt5xml5
-      - qt5-qmake
+      - qt55base
+      - qt55script 
+      - qt55svg
+      - qt55tools
+      - qt55graphicaleffects
+       
+      - mesa-common-dev
+      - libglu1-mesa-dev
       # Not allowed (yet) 
       # - geomview 
       # - libglew1.5-dev