Commit Graph

3508 Commits

Author SHA1 Message Date
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
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
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
Andreas Fabri 0d6459b4df Add change entry 2019-05-06 08:39:07 +02:00
Laurent Rineau 623fd4f10f If BUILD_SHARED_LIBS is not defined, use Boost shared libs 2019-05-03 18:39:30 +02:00
Laurent Rineau 9ec3481be2 Document that Qt 5.9 or later is required 2019-04-30 16:41:44 +02:00
Laurent Rineau 7812d1b810 Boost: link with imported targets, if they exist 2019-04-29 16:36:04 +02:00
Laurent Rineau 62b346bee5
Fix typos 2019-04-29 16:03:13 +02:00
Laurent Rineau 3cb372be34 Do not search for Boost thread when not needed 2019-04-29 15:24:51 +02:00
Laurent Rineau af52b353d2 Boost 1.70 uses the CMake Config mode, now 2019-04-26 17:12:54 +02:00
Laurent Rineau a9fd0a3729 Bug-fix: Boost Thread is a dependency of CGAL_Core only for GNU/g++
Previously, it was documented to g++ only, but the code was just
checking "not MSVC", and thus clang was in the set.
2019-04-26 17:12:01 +02:00
Laurent Rineau 6615d1d12d Change the default value of CGAL_Boost_USE_STATIC_LIBS
It is now related to `BUILD_SHARED_LIBS`.
2019-04-26 17:11:24 +02:00
Laurent Rineau 36dba385a0 Add a bunch of new Boost versions 2019-04-26 17:10:49 +02:00
Laurent Rineau f3bc713103 Typo in a comment 2019-04-26 17:10:35 +02:00
Sébastien Loriot 61a2dae54e fix CHANGES 2019-04-23 10:12:52 +02:00
Sebastien Loriot 295709ab81
Merge pull request #2804 from maxGimeno/Graphics_view-Fix_demo_IO-GF
IO: Add IO functions for WKT format
2019-04-23 10:11:48 +02:00
Sébastien Loriot 5a3e72ed56 Merge pull request #3468 from afabri/Kernel-angle-GF
[Small Feature] Add angle(Vector_3, Vector_3) to the kernel
2019-04-23 10:02:02 +02:00
Sébastien Loriot ca755e35a8 Merge pull request #3599 from maxGimeno/Nef_3-Document_Nef_3_to_Polygon_soup-GF
Nef_3 : Document convert_nef_polyhedron_to_polygon_soup-GF
2019-04-23 09:52:26 +02:00
Sébastien Loriot 1398af1b0b Merge remote-tracking branch 'cgal/master' into HEAD 2019-04-12 17:44:31 +02:00
Maxime GIMENO 41033a80be
Merge branch 'master' into Graphics_view-Fix_demo_IO-GF 2019-04-12 16:10:36 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF
[Small Feature] Reworked CGAL::Color
2019-04-12 15:54:30 +02:00
Sébastien Loriot 1a97dcfb8e Merge pull request #3441 from afabri/PMP-centroid-GF
[Small Feature] Add centroid(TriangleMesh) to Polygon Mesh Processing
2019-04-12 15:45:48 +02:00