Merge remote-tracking branch 'cgal/master' into BGL-add_PMP-GF

Author: afabri

.gitattributes

@@ -18,7 +18,6 @@
 *.js text
 *.hmtl text
 *.bib text
-*.sh text
 *.css text
 *.ui text
 *.qrc text
@@ -36,6 +35,7 @@
 *.pdb text
 
 # Declare files that will always have LF line endings on checkout.
+*.sh text eol=lf
 Documentation/Doxyfile text eol=lf
 Documentation/pkglist_filter text eol=lf
 Installation/update_CHANGES text eol=lf

.github/workflows/cmake-all.yml

@@ -1,16 +1,14 @@
 name: CMake all CGAL
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 0
+    - uses: actions/[email protected]
     - name: install dependencies
       run: sudo apt-get install -y libboost-dev libboost-program-options-dev libmpfr-dev libeigen3-dev
     - name: configure all

.travis.yml

@@ -30,25 +30,26 @@ env:
     - PACKAGE='Minkowski_sum_2 Minkowski_sum_3 Modifier '
     - PACKAGE='Modular_arithmetic Nef_2 Nef_3 '
     - PACKAGE='Nef_S2 NewKernel_d Number_types '
-    - PACKAGE='OpenNL Optimal_transportation_reconstruction_2 Optimisation_basic '
-    - PACKAGE='Partition_2 Periodic_2_triangulation_2 Periodic_3_mesh_3 '
-    - PACKAGE='Periodic_3_triangulation_3 Periodic_4_hyperbolic_triangulation_2 Point_set_2 '
-    - PACKAGE='Point_set_3 Point_set_processing_3 Poisson_surface_reconstruction_3 '
-    - PACKAGE='Polygon Polygon_mesh_processing Polygonal_surface_reconstruction '
-    - PACKAGE='Polyhedron Polyhedron_IO Polyline_simplification_2 '
-    - PACKAGE='Polynomial Polytope_distance_d Principal_component_analysis '
-    - PACKAGE='Principal_component_analysis_LGPL Profiling_tools Property_map '
-    - PACKAGE='QP_solver Random_numbers Ridges_3 '
-    - PACKAGE='STL_Extension Scale_space_reconstruction_3 Scripts '
-    - PACKAGE='SearchStructures Segment_Delaunay_graph_2 Segment_Delaunay_graph_Linf_2 '
-    - PACKAGE='Set_movable_separability_2 Shape_detection Skin_surface_3 '
-    - PACKAGE='Snap_rounding_2 Solver_interface Spatial_searching '
-    - PACKAGE='Spatial_sorting Straight_skeleton_2 Stream_lines_2 '
-    - PACKAGE='Stream_support Subdivision_method_3 Surface_mesh '
-    - PACKAGE='Surface_mesh_approximation Surface_mesh_deformation Surface_mesh_parameterization '
-    - PACKAGE='Surface_mesh_segmentation Surface_mesh_shortest_path Surface_mesh_simplification '
-    - PACKAGE='Surface_mesh_skeletonization Surface_mesher Surface_sweep_2 '
-    - PACKAGE='TDS_2 TDS_3 Testsuite '
+    - PACKAGE='OpenNL Optimal_bounding_box Optimal_transportation_reconstruction_2 '
+    - PACKAGE='Optimisation_basic Partition_2 Periodic_2_triangulation_2 '
+    - PACKAGE='Periodic_3_mesh_3 Periodic_3_triangulation_3 Periodic_4_hyperbolic_triangulation_2 '
+    - PACKAGE='Point_set_2 Point_set_3 Point_set_processing_3 '
+    - PACKAGE='Poisson_surface_reconstruction_3 Polygon Polygon_mesh_processing '
+    - PACKAGE='Polygonal_surface_reconstruction Polyhedron Polyhedron_IO '
+    - PACKAGE='Polyline_simplification_2 Polynomial Polytope_distance_d '
+    - PACKAGE='Principal_component_analysis Principal_component_analysis_LGPL Profiling_tools '
+    - PACKAGE='Property_map QP_solver Random_numbers '
+    - PACKAGE='Ridges_3 STL_Extension Scale_space_reconstruction_3 '
+    - PACKAGE='Scripts SearchStructures Segment_Delaunay_graph_2 '
+    - PACKAGE='Segment_Delaunay_graph_Linf_2 Set_movable_separability_2 Shape_detection '
+    - PACKAGE='Skin_surface_3 Snap_rounding_2 Solver_interface '
+    - PACKAGE='Spatial_searching Spatial_sorting Straight_skeleton_2 '
+    - PACKAGE='Stream_lines_2 Stream_support Subdivision_method_3 '
+    - PACKAGE='Surface_mesh Surface_mesh_approximation Surface_mesh_deformation '
+    - PACKAGE='Surface_mesh_parameterization Surface_mesh_segmentation Surface_mesh_shortest_path '
+    - PACKAGE='Surface_mesh_simplification Surface_mesh_skeletonization Surface_mesh_topology '
+    - PACKAGE='Surface_mesher Surface_sweep_2 TDS_2 '
+    - PACKAGE='TDS_3 Testsuite Tetrahedral_remeshing '
     - PACKAGE='Three Triangulation Triangulation_2 '
     - PACKAGE='Triangulation_3 Union_find Visibility_2 '
     - PACKAGE='Voronoi_diagram_2 wininst '

.travis/build_package.sh

@@ -11,7 +11,7 @@ function mytime {
 function build_examples {
   mkdir -p build-travis
   cd build-travis
-  mytime cmake -DCGAL_DIR="/usr/local/lib/cmake/CGAL" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ..
+  mytime cmake -DCGAL_DIR="/usr/local/lib/cmake/CGAL" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCGAL_BUILD_THREE_DOC=TRUE ..
   mytime make -j2 VERBOSE=1
 }
 
@@ -28,7 +28,7 @@ function build_demo {
       EXTRA_CXX_FLAGS="-Werror=inconsistent-missing-override"
       ;;
   esac
-  mytime cmake -DCGAL_DIR="/usr/local/lib/cmake/CGAL" -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS} ${EXTRA_CXX_FLAGS}" ..
+  mytime cmake -DCGAL_DIR="/usr/local/lib/cmake/CGAL" -DCGAL_DONT_OVERRIDE_CMAKE_FLAGS:BOOL=ON -DCMAKE_CXX_FLAGS="${CXX_FLAGS} ${EXTRA_CXX_FLAGS}"  ..
   mytime make -j2 VERBOSE=1
 }
 old_IFS=$IFS
@@ -57,46 +57,46 @@ cd $ROOT
     cd ..
     IFS=$old_IFS
     mytime zsh $ROOT/Scripts/developer_scripts/test_merge_of_branch HEAD
-    #test dependencies 
+    #test dependencies
     cd $ROOT
     mytime bash Scripts/developer_scripts/cgal_check_dependencies.sh --check_headers /usr/bin/doxygen
 
     cd .travis
-  	#parse current matrix and check that no package has been forgotten
+    #parse current matrix and check that no package has been forgotten
 
-	  IFS=$'\n'
-	  COPY=0
-	  MATRIX=()
-	  for LINE in $(cat "$PWD/packages.txt")
-	  do
-	        MATRIX+="$LINE "
-	  done
-	
-	  PACKAGES=()
-	  cd ..
-  	for f in *
-	  do
-	    if [ -d  "$f/package_info/$f" ]
-	        then
-	                PACKAGES+="$f "
-	        fi
-	  done	
-	
-	  DIFFERENCE=$(echo ${MATRIX[@]} ${PACKAGES[@]} | tr ' ' '\n' | sort | uniq -u)
-	  IFS=$' '
-	  if [ "${DIFFERENCE[0]}" != "" ]
-	  then
-	        echo "The matrix and the actual package list differ : ."
-					echo ${DIFFERENCE[*]}
+    IFS=$'\n'
+    COPY=0
+    MATRIX=()
+    for LINE in $(cat "$PWD/packages.txt")
+    do
+          MATRIX+="$LINE "
+    done
+
+    PACKAGES=()
+    cd ..
+    for f in *
+    do
+      if [ -d  "$f/package_info/$f" ]
+          then
+                  PACKAGES+="$f "
+          fi
+    done
+
+    DIFFERENCE=$(echo ${MATRIX[@]} ${PACKAGES[@]} | tr ' ' '\n' | sort | uniq -u)
+    IFS=$' '
+    if [ "${DIFFERENCE[0]}" != "" ]
+    then
+          echo "The matrix and the actual package list differ : ."
+          echo ${DIFFERENCE[*]}
             echo "You should run generate_travis.sh."
-	        exit 1
-	  fi
-	  echo "Matrix is up to date."
+          exit 1
+    fi
+    echo "Matrix is up to date."
     #check if non standard cgal installation works
     cd $ROOT
     mkdir build_test
     cd build_test
-    mytime cmake -DCMAKE_INSTALL_PREFIX=install/ ..
+    mytime cmake -DCMAKE_INSTALL_PREFIX=install/ -DCGAL_BUILD_THREE_DOC=TRUE ..
     mytime make install
     # test install with minimal downstream example
     mkdir installtest
@@ -110,7 +110,7 @@ cd $ROOT
     echo 'target_link_libraries(${PROJECT_NAME} CGAL::CGAL)' >> CMakeLists.txt
     echo '#include "CGAL/remove_outliers.h"' >> main.cpp
     cd build
-    mytime cmake -DCMAKE_INSTALL_PREFIX=../../install ..
+    mytime cmake -DCMAKE_INSTALL_PREFIX=../../install -DCGAL_BUILD_THREE_DOC=TRUE ..
     cd ..
     exit 0
   fi
@@ -126,7 +126,7 @@ cd $ROOT
   fi
   IFS=$' '
   EXAMPLES="$ARG/examples/$ARG"
-  TEST="$ARG/test/$ARG" 
+  TEST="$ARG/test/$ARG"
   DEMOS=$ROOT/$ARG/demo/*
 
   if [ -d "$ROOT/$EXAMPLES" ]
@@ -168,17 +168,17 @@ cd $ROOT
   for DEMO in $DEMOS; do
     DEMO=${DEMO#"$ROOT"}
     echo $DEMO
-  	#If there is no demo subdir, try in GraphicsView
+    #If there is no demo subdir, try in GraphicsView
     if [ ! -d "$ROOT/$DEMO" ] || [ ! -f "$ROOT/$DEMO/CMakeLists.txt" ]; then
      DEMO="GraphicsView/demo/$ARG"
     fi
-	  if [ "$ARG" != Polyhedron ] && [ -d "$ROOT/$DEMO" ]
-  	then
+    if [ "$ARG" != Polyhedron ] && [ -d "$ROOT/$DEMO" ]
+    then
       cd $ROOT/$DEMO
       build_demo
     elif [ "$ARG" != Polyhedron_demo ]; then
       echo "No demo found for $ARG"
-	  fi
+    fi
   done
   if [ "$ARG" = Polyhedron_demo ]; then
     DEMO=Polyhedron/demo/Polyhedron

.travis/generate_travis.sh

@@ -21,7 +21,7 @@ for f in *
 do
   if [ -d  "$f/package_info/$f" ]
 	then
-  	echo "$f " >> ./tmp.txt
+	echo "$f" >> ./tmp.txt
 	fi
 done
         LC_ALL=C sort ./tmp.txt > ./.travis/packages.txt