From 9b2b6289d098e8ac5c15ae54727ecdf0e3ab4171 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 26 Mar 2018 09:30:04 +0200 Subject: [PATCH 1/4] remove -v option of tar --- .travis/install_openmesh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install_openmesh.sh b/.travis/install_openmesh.sh index 62624eb191a..1c2deb532bc 100644 --- a/.travis/install_openmesh.sh +++ b/.travis/install_openmesh.sh @@ -2,7 +2,7 @@ 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 +tar xf openmesh.tar.gz --strip-components=1 &>/dev/null sed -i '94i #include ' src/OpenMesh/Tools/Utils/conio.cc From 188c259d9b24d4731b070dd4a1a573e9237d73e8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 26 Mar 2018 09:35:15 +0200 Subject: [PATCH 2/4] No need to hide errors --- .travis/install_openmesh.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis/install_openmesh.sh b/.travis/install_openmesh.sh index 1c2deb532bc..9b7a4f8e890 100644 --- a/.travis/install_openmesh.sh +++ b/.travis/install_openmesh.sh @@ -2,8 +2,7 @@ mkdir -p openmesh cd openmesh wget -O openmesh.tar.gz https://www.openmesh.org/media/Releases/6.3/OpenMesh-6.3.tar.gz -tar xf openmesh.tar.gz --strip-components=1 &>/dev/null - +tar xf openmesh.tar.gz --strip-components=1 sed -i '94i #include ' src/OpenMesh/Tools/Utils/conio.cc mkdir build From 6c39cae662eef9c1c98efcc230b3ef969b242587 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 26 Mar 2018 10:12:17 +0200 Subject: [PATCH 3/4] Fix instructions for dependencies update --- Scripts/developer_scripts/cgal_check_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/developer_scripts/cgal_check_dependencies.sh b/Scripts/developer_scripts/cgal_check_dependencies.sh index 20c98b4b138..de3f26f48b7 100644 --- a/Scripts/developer_scripts/cgal_check_dependencies.sh +++ b/Scripts/developer_scripts/cgal_check_dependencies.sh @@ -51,7 +51,7 @@ echo " Checks finished" cd $CGAL_ROOT rm -r dep_check_build 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 else echo "The dependencies are up to date." From 3be7b4f8af1b27c9688918539b030b24daee53f5 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 26 Mar 2018 10:28:08 +0200 Subject: [PATCH 4/4] fix cd $ROOT that was done too soon --- .travis/build_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/build_package.sh b/.travis/build_package.sh index b034ad595ce..a211a18ab5b 100755 --- a/.travis/build_package.sh +++ b/.travis/build_package.sh @@ -51,9 +51,9 @@ old_IFS=$IFS IFS=$' ' ROOT="$PWD/.." NEED_3D=0 -cd $ROOT for ARG in $(echo "$@") do +cd $ROOT #install openmesh only if necessary if [ "$ARG" = "CHECK" ] || [ "$ARG" = BGL ] || [ "$ARG" = Convex_hull_3 ] ||\ [ "$ARG" = Polygon_mesh_processing ] || [ "$ARG" = Property_map ] ||\