Merge pull request #2329 from maxGimeno/Use_qt5_5_for_travis-GF

Travis uses qt-5.5

.travis.yml

@@ -43,19 +43,16 @@ env:
   - PACKAGE='TDS_3 Three Triangulation ' 
   - PACKAGE='Triangulation_2 Triangulation_3 Union_find ' 
   - PACKAGE='Visibility_2 Voronoi_diagram_2 ' 
-  - PACKAGE='Polyhedron_demo'
-
-
+  - 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: 
@@ -64,7 +61,8 @@ script:
 addons: 
   apt:
     sources:
-      - sourceline: 'ppa:ppsspp/cmake'
+      - sourceline: 'ppa:ppsspp/cmake' 
+      - sourceline: 'ppa:hedges/qt5.5'
     packages:
       - clang-3.6
       - zsh
@@ -77,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 

.travis/build_package.sh

@@ -22,7 +22,7 @@ function build_demo {
     git clone --depth=4 -b v2.6.3 --single-branch https://github.com/GillesDebunne/libQGLViewer.git ./qglviewer
     pushd ./qglviewer/QGLViewer
     #use qt5 instead of qt4
-    export QT_SELECT=5
+#    export QT_SELECT=5
     qmake NO_QT_VERSION_SUFFIX=yes
     make -j2
     if [ ! -f libQGLViewer.so ]; then
@@ -44,7 +44,7 @@ function build_demo {
     QGLVIEWERROOT=$PWD/qglviewer
     export QGLVIEWERROOT
   fi
-  cmake -DCGAL_DIR="$ROOT/build" -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=ON -DCMAKE_CXX_FLAGS_RELEASE="${CXX_FLAGS} ${EXTRA_CXX_FLAGS}" ..
+  cmake -DCGAL_DIR="$ROOT/build" -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" -DQt5Svg_DIR="/opt/qt55/lib/cmake/Qt5Svg" -DQt5OpenGL_DIR="/opt/qt55/lib/cmake/Qt5OpenGL" -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=ON -DCMAKE_CXX_FLAGS_RELEASE="${CXX_FLAGS} ${EXTRA_CXX_FLAGS}" ..
   make -j2
 }
 
@@ -58,7 +58,7 @@ do
     zsh $ROOT/Scripts/developer_scripts/test_merge_of_branch HEAD
     mkdir -p build-travis
     pushd build-travis
-    cmake -DCGAL_ENABLE_CHECK_HEADERS=ON ../..
+    cmake -DCGAL_ENABLE_CHECK_HEADERS=ON -DQt5_DIR="/opt/qt55/lib/cmake/Qt5" ../..
     make -j2 check_headers
     popd
   	#parse current matrix and check that no package has been forgotten

.travis/generate_travis.sh

@@ -61,7 +61,7 @@ echo "  - PACKAGE='Polyhedron_demo' " >> .travis.yml
 COPY=0
 for LINE in $(cat "$PWD/.travis/template.txt")
 do
-	if [ "$LINE" = "install: " ]
+	if [ "$LINE" = "compiler: " ]
 	then
 		COPY=1
 	fi

.travis/template.txt

@@ -13,7 +13,7 @@ install:
 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: 
@@ -22,7 +22,8 @@ script:
 addons: 
   apt:
     sources:
-      - sourceline: 'ppa:ppsspp/cmake'
+      - sourceline: 'ppa:ppsspp/cmake' 
+      - sourceline: 'ppa:hedges/qt5.5'
     packages:
       - clang-3.6
       - zsh
@@ -35,16 +36,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