songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2957 from maxGimeno/Travis-silence_openmesh_installation-GF 

Travis: Fixes
This commit is contained in:
Laurent Rineau 2018-03-27 11:12:52 +02:00
parent 237735ab73 4b7f331344
commit 578e2fb606
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/build_package.sh
View File

@ -51,9 +51,9 @@ old_IFS=$IFS
IFS=$' ' IFS=$' '
ROOT="$PWD/.." ROOT="$PWD/.."
NEED_3D=0 NEED_3D=0
cd $ROOT
for ARG in $(echo "$@") for ARG in $(echo "$@")
do do
cd $ROOT
#install openmesh only if necessary #install openmesh only if necessary
if [ "$ARG" = "CHECK" ] || [ "$ARG" = BGL ] || [ "$ARG" = Convex_hull_3 ] ||\ if [ "$ARG" = "CHECK" ] || [ "$ARG" = BGL ] || [ "$ARG" = Convex_hull_3 ] ||\
[ "$ARG" = Polygon_mesh_processing ] || [ "$ARG" = Property_map ] ||\ [ "$ARG" = Polygon_mesh_processing ] || [ "$ARG" = Property_map ] ||\

3
.travis/install_openmesh.sh
View File

@ -2,8 +2,7 @@
mkdir -p openmesh mkdir -p openmesh
cd openmesh cd openmesh
wget -O openmesh.tar.gz https://www.openmesh.org/media/Releases/6.3/OpenMesh-6.3.tar.gz 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 tar xf openmesh.tar.gz --strip-components=1
sed -i '94i #include <sys/time.h>' src/OpenMesh/Tools/Utils/conio.cc sed -i '94i #include <sys/time.h>' src/OpenMesh/Tools/Utils/conio.cc
mkdir build mkdir build

2
Scripts/developer_scripts/cgal_check_dependencies.sh
View File

@ -51,7 +51,7 @@ echo " Checks finished"
cd $CGAL_ROOT cd $CGAL_ROOT
rm -r dep_check_build rm -r dep_check_build
if [ -n "$HAS_DIFF" ]; then if [ -n "$HAS_DIFF" ]; then
echo " You should run cmake with options CGAL_CHECK_HEADERS and CGAL_COPY_DEPENDENCIES ON, make the target packages_dependencies and commit the new dependencies files." echo " You should run cmake with options CGAL_ENABLE_CHECK_HEADERS and CGAL_COPY_DEPENDENCIES ON, make the target packages_dependencies and commit the new dependencies files."
exit 1 exit 1
else else
echo "The dependencies are up to date." echo "The dependencies are up to date."