diff --git a/.travis.yml b/.travis.yml index bb0f8efa75b..ef80008ff65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,8 +61,9 @@ before_script: - 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" -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG .. - make - sudo make install &>/dev/null -- cd .. -script: +- cd .. +- sudo bash ./.travis/install_openmesh.sh +script: - cd ./.travis - bash -x -e ./build_package.sh $PACKAGE addons: diff --git a/.travis/install_openmesh.sh b/.travis/install_openmesh.sh new file mode 100644 index 00000000000..62624eb191a --- /dev/null +++ b/.travis/install_openmesh.sh @@ -0,0 +1,17 @@ +#!/bin/bash +mkdir -p openmesh +cd openmesh +wget -O openmesh.tar.gz https://www.openmesh.org/media/Releases/6.3/OpenMesh-6.3.tar.gz +tar xvf openmesh.tar.gz --strip-components=1 + +sed -i '94i #include ' src/OpenMesh/Tools/Utils/conio.cc + +mkdir build +cd build +cmake -DBUILD_APPS=FALSE .. +make -j2 +sudo make -j2 install &>/dev/null + +#clean up +cd ../.. +rm -rf ./openmesh diff --git a/.travis/template.txt b/.travis/template.txt index e660974e3b8..c48cb2c88a9 100644 --- a/.travis/template.txt +++ b/.travis/template.txt @@ -16,8 +16,9 @@ before_script: - 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" -DCMAKE_CXX_FLAGS_RELEASE=-DCGAL_NDEBUG .. - make - sudo make install &>/dev/null -- cd .. -script: +- cd .. +- sudo bash ./.travis/install_openmesh.sh +script: - cd ./.travis - bash -x -e ./build_package.sh $PACKAGE addons: diff --git a/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h b/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h index e291c006f1a..3762bb5a984 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h @@ -26,7 +26,6 @@ #include -#include #include #include #include diff --git a/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h b/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h index a7de8eacefe..f9864953b14 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h @@ -21,7 +21,7 @@ #define CGAL_BOOST_GRAPH_GRAPH_TRAITS_POLYMESH_ARRAYKERNELT_H // http://openmesh.org/Documentation/OpenMesh-Doc-Latest/classOpenMesh_1_1Concepts_1_1KernelT.html - +#include #include #include diff --git a/BGL/include/CGAL/boost/graph/graph_traits_TriMesh_ArrayKernelT.h b/BGL/include/CGAL/boost/graph/graph_traits_TriMesh_ArrayKernelT.h index 87d33c6ca1a..c69b54849b4 100644 --- a/BGL/include/CGAL/boost/graph/graph_traits_TriMesh_ArrayKernelT.h +++ b/BGL/include/CGAL/boost/graph/graph_traits_TriMesh_ArrayKernelT.h @@ -21,7 +21,7 @@ #define CGAL_BOOST_GRAPH_GRAPH_TRAITS_TRIMESH_ARRAYKERNELT_H // http://openmesh.org/Documentation/OpenMesh-Doc-Latest/classOpenMesh_1_1Concepts_1_1KernelT.html - +#include #include #include