Commit Graph

58643 Commits

Author SHA1 Message Date
Laurent Rineau fd2026a044 Find TBB first with NO_DEFAULT_PATH
With default CMake paths, the TBB installed in /usr/{include/,lib64/} is
found, whatever there is in TBB environment variables. If the search
with NO_DEFAULT_PATH does not find TBB, then the search is made again
with default paths.
2015-01-15 14:39:31 +01:00
Laurent Rineau 0c9c775671 Display time before the assertion
On one platform, the assertion assert( t.time() >= 0.0); fails. I want
to display t.time() before checking its sign.

Trivial bug fix for master.
2015-01-15 11:06:44 +01:00
Aymeric PELLE d61d7063f4 Merge branch 'Fix_missing_return_statement_p3t3-APelle'
Add a return statement at the end of Periodic_3_triangulation_3::point().
Approved by the release manager.
2015-01-14 20:39:05 +01:00
Laurent Rineau 31c965a070 One script to rule them all!
This script makes various checks on branches that are candidate to be
merged in CGAL.
2015-01-14 19:43:06 +01:00
Laurent Rineau 63944ff69b Better implementation 2015-01-14 19:42:53 +01:00
Sébastien Loriot b6f5088676 Merge branch 'Scale_space_reconstruction_3-tvanlank'
Tested in CGAL-4.6-Ic-104
   Approved by the release manager
2015-01-14 16:09:11 +01:00
Andreas Fabri e5d759f508 Add Surface_mesh as model of the new BGL graph concepts 2015-01-14 15:41:09 +01:00
Laurent Rineau 9ee9b7ae90 Add -Wno-variadic-macros to the "ansi" platform
That will allows the "ansi" platform to compile correctly the
Newkernel_d package.
2015-01-14 14:24:06 +01:00
Laurent Rineau 83cdc43de9 Test with Boost-1.57 2015-01-14 14:19:18 +01:00
Andreas Fabri 9b4a1f219f no \cite in \brief as doxygen stops the brief description right before the \cite 2015-01-14 09:15:26 +01:00
Sébastien Loriot ab133ebe3d move implementation detail out of the scope of include/CGAL
trivial bug fix for master
2015-01-13 18:31:28 +01:00
Clement Jamin 8d433181f4 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu'
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Point_set_processing_new_algorithms
Tested in CGAL-4.6-Ic-101
Approved by the release manager
2015-01-13 17:28:21 +01:00
Laurent Rineau 896d85899d updated crontab (automated commit) 2015-01-13 17:18:03 +01:00
Laurent Rineau 0e2164266d Add flag -diag-disable 1017
The warning 1017 is the buggy following warning:

include/CGAL/Combinatorial_map.h(1567): warning #1017: name following "template" must be a template
        this->template dart_link_beta<0>(adart1, adart2);
                       ^
2015-01-13 14:40:35 +01:00
Laurent Rineau 7394f596ae Fix after renaming of the example 2015-01-12 17:44:55 +01:00
Laurent Rineau c6ece2b10e Fix permissions 2015-01-12 16:23:14 +01:00
Laurent Rineau 914f8eeec7 cosmetic change of the licenses.txt file
The script Scripts/developer_scripts/detect_packages_licenses expects a
very strict syntax. There was an extra empty line.
2015-01-12 16:21:05 +01:00
Andreas Fabri 2cee9fc33e Merge branch 'CGAL-misc_warnings-GF'
Approved by the release manager
2015-01-12 13:00:41 +01:00
Aymeric PELLE f511291e38 Trivial warning fix : Fix Missing statement in P3T3::point(Cell_handle, int). 2015-01-12 11:56:38 +01:00
Andreas Fabri a92e4101d8 Merge branch 'CGAL_workaround_counting_iterator-GF'
Approved by the release manager
2015-01-12 11:48:10 +01:00
Andreas Fabri 8929fd43c1 Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
Approved by the release manager
Conflicts:
	Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
Andreas Fabri 02b26e679c Merge branch 'Operations_on_polyhedra-BGLization-GF'
Approved by the release manager
2015-01-12 11:31:06 +01:00
Andreas Fabri babaa99826 Merge branch 'CGAL-Getting_Started-GF'
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/main.txt
2015-01-12 11:29:26 +01:00
Andreas Fabri 6e36a853a9 Merge branch 'Surface_mesh-new_package-GF'
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/resources/how_to_cite_cgal.bib.in
	Installation/changes.html
2015-01-12 11:27:35 +01:00
Andreas Fabri 07e62f3a1a take bibtex input file from master and put the Surface_mesh entry at the right spot 2015-01-12 10:24:39 +01:00
Andreas Fabri 4b3c35870c take bibtex input file from master and put the Polyline Simplification entry at the right spot 2015-01-12 10:20:49 +01:00
Andreas Fabri 3d99924000 add to examples.txt 2015-01-10 13:01:06 +01:00
Andreas Fabri 4be90e89dc shorten name of example to avoid CMake warning in the testsuite 2015-01-10 12:58:32 +01:00
Clement Jamin 1ecb4da13b Add new xyz file 2015-01-09 16:43:12 +01:00
Clement Jamin c73e67db59 The test was too slow in Debug mode 2015-01-09 16:35:19 +01:00
Sébastien Loriot 0c2b3fb3a0 size_t -> std::size_t 2015-01-09 16:13:05 +01:00
Sébastien Loriot f4a88dd2af rename include guards 2015-01-09 15:58:31 +01:00
Clement Jamin 46ea9798fe Add license.txt for Triangulation
I forgot to add it before the merge into master
2015-01-09 15:57:07 +01:00
Sébastien Loriot fe88d44c1a move impl file out of the CGAL path 2015-01-09 15:56:34 +01:00
Clement Jamin ecda2555ab Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu-old' into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2015-01-09 15:55:40 +01:00
Sébastien Loriot 053ae07dd9 followup of previous commit
forgot to remove include
2015-01-09 15:55:02 +01:00
Sébastien Loriot 781d4b9402 remove unused file 2015-01-09 15:53:39 +01:00
Sébastien Loriot 71c6c15d8a remove comments 2015-01-09 15:53:39 +01:00
Andreas Fabri d09c1742bb Add a \subsection for the Output Surface 2015-01-09 15:52:51 +01:00
Clement Jamin fe47edc68a Faster example 2015-01-09 15:51:09 +01:00
Sébastien Loriot ab1ce26ffb remove exe flag 2015-01-09 14:18:42 +01:00
Sébastien Loriot 2c961258cb update changes and bibtex file 2015-01-09 14:14:30 +01:00
Sébastien Loriot 53c52bc516 Merge branch 'old/Scale_space_reconstruction_3-tvanlank' into Scale_space_reconstruction_3-tvanlank 2015-01-09 14:03:59 +01:00
Sébastien Loriot d2e0dca2f9 update changes 2015-01-09 12:36:07 +01:00
Sébastien Loriot ad79ba822c Merge branch 'Convex_hull_3-fix_2dhull_4.6-local'
Tested in CGAL-4.6-Ic-99
  Approved by the release manager
2015-01-09 12:28:32 +01:00
Sébastien Loriot aa3feae736 Remove no longer needed predicates/constructions
follow up of 90ee311ba9
2015-01-09 12:27:23 +01:00
Sébastien Loriot 4f46679435 Merge branch 'releases/CGAL-4.5-branch' 2015-01-09 12:23:06 +01:00
Sébastien Loriot 8d78c767ea Merge branch 'Convex_hull_3-fix_Convex_hull_traits_3_4.5-local' into releases/CGAL-4.5-branch
Tested in master branch in CGAL-4.6-Ic-99
  Approved by the release manager
2015-01-09 12:20:59 +01:00
Sébastien Loriot b7caf33fbd filter the predicates in Convex_hull_traits_3 if requested 2015-01-09 12:20:14 +01:00
Sébastien Loriot 6b9945c271 Merge branch 'Convex_hull_3-fix_2dhull_4.5-local' into releases/CGAL-4.5-branch
Tested in master in 4.6-Ic-99
  Approved by the release manager
2015-01-09 12:16:53 +01:00