Commit Graph

3529 Commits

Author SHA1 Message Date
Laurent Rineau 17add8332e Merge pull request #3903 from MaelRL/PMP-Generalize_keep_largest_CC-GF
PMP: Generalize `keep_large(st)_CCs`
2019-06-20 14:21:14 +02:00
Laurent Rineau 8fd3f2d8fd Merge pull request #3973 from sgiraudot/Kernel_23-Add_hash_functions-GF
[Small Feature] Add hash functions for kernel objects
2019-06-20 14:21:09 +02:00
Mael Rouxel-Labbé b1a37a0f1e Update CHANGES.md 2019-06-17 15:19:00 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-17 14:10:35 +02:00
Laurent Rineau e4353afb13 Merge pull request #3861 from MaelRL/PMP-Add_stitch_boundary_cycle_singular-GF
PMP: Introduce `stitch_boundary_cycle`
2019-06-17 13:54:39 +02:00
Laurent Rineau 395e4965b7 Remove use of qt5_use_modules (warned deprecated with CMake-3.14) 2019-06-14 15:15:40 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Laurent Rineau e4993273c5 Merge pull request #3864 from danston/Point_set_shape_detection_3-make_it_general_with_region_growing-danston
[Feature] Shape detection with region growing
2019-06-05 11:20:29 +02:00
Laurent Rineau 39c8f7ae1f Merge pull request #3950 from afabri/Triangulation_23-PointWithInfo-GF
2D and 3D Triangulations:  Unify insertion of range of points with info
2019-06-05 11:20:23 +02:00
Simon Giraudot 0a87e078b9 Add Sphere_3 to changes 2019-06-05 10:51:25 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Andreas Fabri 5532b84b4f nullptr_t -> std::nullptr_t 2019-06-05 07:28:56 +02:00
Laurent Rineau d05de694ef
typo 2019-06-04 17:00:17 +02:00
Simon Giraudot 9ee478139b Remove hash for Direction_23/Ray_23 as equality is more complicated 2019-06-04 13:26:05 +02:00
Simon Giraudot 44907c8326 Update CHANGES.md 2019-06-04 10:42:23 +02:00
Dmitry Anisimov 3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston 2019-05-23 10:38:45 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Laurent Rineau 5dc823d509 Merge branch 'releases/CGAL-4.14-branch' 2019-05-23 08:49:56 +02:00
Laurent Rineau 7be5e3fbe5 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-23 08:44:39 +02:00
Laurent Rineau c1a13a0a1e Merge pull request #3949 from lrineau/Installation-fix_ctest_for_Andreas-GF
Fix CTest CGAL tests when binary dir is a sub-directory
2019-05-23 08:31:44 +02:00
Simon Giraudot 69574884a0 Add changes about old PSP API removed 2019-05-22 11:14:32 +02:00
Andreas Fabri d318f1e938 Update changes.md 2019-05-22 11:08:37 +02:00
Laurent Rineau 268cb59ce1 Merge pull request #3739 from lrineau/Installation-remove_FindBLAS_LAPACK_TAUCS-GF
Remove support for BLAS, LAPACK, and TAUCS
2019-05-21 16:37:10 +02:00
Laurent Rineau 7e58feacfe Merge pull request #3797 from afabri/CGAL-Exact_algebraic-GF
Number_types:  Add Exact_algebraic
2019-05-21 16:37:07 +02:00
Laurent Rineau 3a9b2fe67f Merge branch 'releases/CGAL-4.14-branch' 2019-05-21 16:36:28 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Laurent Rineau 357fe1e486 Fix CTest CGAL tests when binary dir is a sub-directory
When the current binary dir is a sub-directory of the current sources
dir, then the recursive copy of the sources dir to `__exec_test_dir/`
cannot be done. In that case, do not setup the fixture
directory. Tests can still be run in the source directory (and pollute
it).
2019-05-20 12:18:18 +02:00
Laurent Rineau eeb32f50c3
Merge branch 'master' into PMP-Add_stitch_boundary_cycle_singular-GF 2019-05-20 11:55:38 +02:00
Mael Rouxel-Labbé 213222cc67 Modify CHANGES.md 2019-05-20 11:20:10 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau 7bcad36d7e
Merge branch 'master' into Installation-remove_FindBLAS_LAPACK_TAUCS-GF 2019-05-14 16:03:28 +02:00
Laurent Rineau 9cbfcee84f Merge branch 'master' into CGAL-Exact_algebraic-GF 2019-05-13 18:11:00 +02:00
Laurent Rineau aeb07e63d6
Fix a typo that was reintroduced in the merge 2019-05-13 17:33:43 +02:00
Laurent Rineau 0600f65f99
Merge branch 'master' into CDTplus_2-deprecated-GF 2019-05-13 17:25:57 +02:00
Laurent Rineau c2e8365303 Actually, it can only work with CMake>=3.11 2019-05-10 17:47:58 +02:00
Laurent Rineau a0bfaee9eb Consider CGAL as an imported target 2019-05-10 17:31:17 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
Laurent Rineau 6cff0987ad Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:47:59 +02:00
Laurent Rineau aebb058b58 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:45:00 +02:00
Simon Giraudot a74233fb9e Update CHANGES.md 2019-05-07 09:23:08 +02:00
Laurent Rineau 43cc6b2b2d CGAL_TweakFindBoost must be included before any call to FindBoost 2019-05-06 16:40:50 +02:00
Laurent Rineau 91d7fd4cb2 CGAL_TweakFindBoost must be included first 2019-05-06 16:34:07 +02:00
Laurent Rineau 212a088c5e That variable CGAL_TweakFindBoost was useless if not set 2019-05-06 16:33:42 +02:00
Laurent Rineau d8e23fefd2 CGAL requires CMake 3.1, that know about Boost 1.56 or before 2019-05-06 16:33:01 +02:00
Laurent Rineau ba2bf5e506 Merge pull request #3894 from lrineau/CGAL-Qt_version_5.9_or_later-GF
Document that Qt 5.9 or later is required
2019-05-06 15:30:24 +02:00
Laurent Rineau dd703beff1 Merge pull request #3894 from lrineau/CGAL-Qt_version_5.9_or_later-GF
Document that Qt 5.9 or later is required
2019-05-06 15:01:58 +02:00
Andreas Fabri dfc9d6e62d Cleanup of another change entry heading 2019-05-06 09:09:59 +02:00
Andreas Fabri 8d20e3bf69 Add change entry 2019-05-06 09:08:41 +02:00