e08c28727c
Add #defines to trick moc
...
(cherry picked from commit 5db9675db8
2015-01-26 16:25:58 +01:00
ff62595012
Merge branch 'CGAL-fix_compilation_boost_1_56-lrineau'
...
Fix compilation issues with Boost-1.56 and later.
Approved by the Release Manager.
2015-01-26 11:42:29 +01:00
87c340fc64
Merge remote-tracking branch 'origin/CGAL_moc_BOOST_JOIN-GF'
...
Fix the compilation of Qt4 demos, when Boost-1.57 is used.
Approved by the Release Manager.
2015-01-26 11:23:57 +01:00
d444701fa0
Add that Kd_tree::begin(0/end() is not in the insertion order
2015-01-20 10:40:10 +01:00
5db9675db8
Add #defines to trick moc
2015-01-19 17:54:26 +01:00
b3f769d486
Merge remote-tracking branch 'origin/Installation-test_tbb_4.3-GF'
...
Tested in CGAL-4.6-Ic-107
Approved by the (interim) release manager
2015-01-16 15:41:50 +01:00
59a7f710dd
Merge branch 'Spatial_searching-final_acceleration-gf'
...
Improve the performance of Spatial Searching.
Small features:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Spatial_searching_performance_optimization
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/spatial_searching_compiletimeD
Approved by the Release Manager
Conflicts:
Installation/changes.html
2015-01-15 15:31:35 +01:00
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
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
d80ee9422a
Merge branch 'CGAL-fix_compilation_boost_1_56_4.5-branch-lrineau' into CGAL-fix_compilation_boost_1_56-lrineau
...
Conflicts:
Installation/changes.html
2015-01-14 14:49:52 +01:00
5134b29461
Update the changes.html file
2015-01-13 17:30:45 +01:00
a92e4101d8
Merge branch 'CGAL_workaround_counting_iterator-GF'
...
Approved by the release manager
2015-01-12 11:48:10 +01:00
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
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
2c961258cb
update changes and bibtex file
2015-01-09 14:14:30 +01:00
d2e0dca2f9
update changes
2015-01-09 12:36:07 +01:00
43e8fae5f8
cosmetic changes
2015-01-09 10:49:26 +01:00
0218954ea6
Merge branch 'barycentric_coordinates_2-dmitry'
...
Tested in CGAL-4.6-Ic-99 and CGAL-4.6-Ic-100
Approved by the release manager
Conflicts:
Installation/changes.html
Kernel_23/include/CGAL/internal/Projection_traits_3.h
2015-01-09 10:35:20 +01:00
5adf8e388c
Workaround for boost::container::deque; 1 bug fix
2015-01-09 10:23:32 +01:00
e0b402b094
Merge branch 'Triangulation-higher_dimensions-odevil_shornus'
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Triangulation_d
Tested in CGAL-4.6-Ic-98
Approved by the release manager
2015-01-08 18:15:34 +01:00
02ab5261bc
Approved by the Release Manager
...
Merge branch 'Generators_convex-rthomass'
2015-01-08 15:46:24 +01:00
9a6ed32a15
Merge branch 'Combinatorial_map-update_attributes-sbrandel'
...
- corresponding to small feature "Combinatorial map update attributes"
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager
Conflicts:
Installation/changes.html
2015-01-08 14:48:47 +01:00
188ee42012
Restore the executable bit of all scripts
2015-01-07 17:54:56 +01:00
92681aae83
added changes in Installation/changes.html
2015-01-07 16:21:16 +01:00
4f5619e349
Add a README.md at the root of the SCM repository
...
- A file INSTALL.md is also added,
- Installation/INSTALL is added the .md extension,
2015-01-07 11:40:24 +01:00
f85647f666
changes.html
2015-01-06 17:04:30 +01:00
8e4a486024
Updated file changes.html.
2014-12-29 16:40:15 +01:00
7d9f7bcf9c
Test update and modification of the file changes.html.
2014-12-29 16:16:30 +01:00
476fadca6a
Add Surface_mesh to changes.html
2014-12-22 18:05:42 +01:00
e6f1aaa801
Fix the HTML in changes.html
2014-12-22 16:50:03 +01:00
6b54e74af5
fix opy paste error
2014-12-20 16:15:08 +01:00
30faf6241b
Add wrappers around 2 boost headers to push/pop pragma
2014-12-19 16:10:02 +01:00
b85f97593a
Add entry in changes.html
2014-12-19 14:43:08 +01:00
7a06a08ca4
Update doc to state that ICC prior to version 15 is not supported for Epick_d
...
Approved by the Release Manager
2014-12-18 12:42:34 +01:00
315ffdcbc8
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-12-18 09:32:23 +01:00
c043a0dca9
Merge branch 'Installation-Boost_DEBUG-lrineau'
...
Add Boost_DEBUG as a CMake advanced option.
2014-12-17 17:08:43 +01:00
79d2f2383c
update changes
2014-12-16 11:52:59 +01:00
f3ab2cf92d
Merge branch 'to-be-tested/Triangulation_3-determinism-gf'
...
make Triangulation_3 deterministic from platform to platform
on degenerate cases
Approved by the release manager
2014-12-15 14:01:45 +01:00
6b6af12353
fix the BOOST_JOIN parse error in demos
...
somehow, boost/random.hpp includes boost/type_traits/has_binary_operator.hpp,
and the "parse error" happens in this file (as said in the bug report)
Also update the link to the official Qt bug report
2014-12-11 12:17:44 +01:00
e7fa0e396d
Updated changes.html
2014-12-11 10:13:07 +01:00
3972130053
update changes.html
2014-12-11 08:50:21 +01:00
9da9cff768
Merge branch 'Spatial_searching-Rectangle_compiletimeD-gf' into Spatial_searching-final_acceleration-gf
...
Conflicts:
Spatial_searching/benchmark/Spatial_searching/nn3cgal.cpp
Spatial_searching/include/CGAL/Kd_tree.h
Spatial_searching/include/CGAL/Kd_tree_node.h
2014-11-28 13:10:08 +01:00
5b67887a5e
Merge branch 'Spatial_searching-Sliding_Midpoint_Splitter_bugfix-gf' into Spatial_searching-final_acceleration-gf
2014-11-28 12:43:12 +01:00
09da20c021
Merge branch 'Mesh_3-fix_integer_overflow-jtournoi'
...
this branch fixes Image_IO for large images, when the
dimensions do not fit in 'unsigned int'
'size_t' is now used everywhere that deals with image sizes
and pixel/voxel coordinates
fix suggested by a CGAL user
Tested in CGAL-4.6-Ic-64.
Approved by the Release Manager.
2014-11-28 12:33:40 +01:00
8231a36e89
Add Boost_DEBUG as an advanced OPTION
2014-11-28 12:09:14 +01:00
c6de2a50b2
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-11-20 19:19:23 +01:00
4b46c889e4
update changes.html
2014-11-10 10:42:20 +01:00
7d63f9d072
Merge branch 'releases/CGAL-4.5-branch'
...
Conflicts:
Installation/changes.html
Maintenance/release_building/public_release_name
2014-11-06 10:47:45 +01:00
d85eaa327c
Merge remote-tracking branch 'origin/Mesh_3-fix_exuder_holes_on_surface-GF' into releases/CGAL-4.5-branch
...
Bug-fix for Mesh_3:
Fix a bug in the sliver exudation preservation of boundaries.
Approved by the Release Manager.
2014-10-31 11:32:09 +01:00
dd71424b23
Added Spatial_searching Splitter bugfix to changes.html
2014-10-31 11:29:37 +01:00
df0ec2e54d
mention exuder bug fix in changes.html
2014-10-21 11:29:07 +02:00
908d608072
Merge branch 'releases/CGAL-4.5-branch'
...
Conflicts:
Installation/changes.html
2014-10-20 14:46:36 +02:00
52c4437539
This branch needs to bump the SONAME
2014-10-20 14:41:14 +02:00
8d61c8db07
Add comments (following the manual chapters)
2014-10-06 16:52:22 +02:00
f5d89b443e
Update CHANGES
2014-10-06 16:46:28 +02:00
aabd9dc557
update changes
2014-09-29 08:44:51 +02:00
377342b311
add backward compatibility class/doc/test
2014-09-23 11:34:47 +02:00
0040d62791
Update changes.html
2014-09-18 15:09:41 +02:00
8f259e5dea
Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus
2014-09-09 11:20:33 +02:00
58e1779c1e
Prepare future final release 4.5
2014-08-29 15:22:35 +02:00
311b505cad
Update the comment about the SOversion
...
Trivial fix for master
2014-08-18 15:35:17 +02:00
d4bdae3077
Prepare CGAL-4.5-beta1
2014-08-12 19:09:57 +02:00
daa20fd1aa
Better tests
...
Current version of leda-numbers still fails. :-(
2014-08-11 19:55:21 +02:00
3ae8979318
Add a test for LEDA
...
When LEDA is available, that test program tests very basic I/O
operations of `leda::rational`. That also tests the link with LEDA.
2014-08-11 19:55:21 +02:00
9b0a59972f
Support for LEDA_numbers on Windows
...
trivial fix for master (and approved by the Release Manager)
2014-08-07 14:16:38 +02:00
865eee70f7
Support LEDA with thread-support
...
If one use a library of LEDA that support threads, without setting
LEDA_MULTI_THREAD, then one can get segfaults when creating new LEDA
objects.
2014-08-04 15:53:58 +02:00
6cba91ac8f
Recode changes.html to UTF-8.
...
And update CHANGES.
2014-08-01 14:12:55 +02:00
3214507a45
Merge branch 'CGAL-fix_cmake_3-GF'
...
Add the compatibility with CMake 3.0, without using any new feature.
Tested in CGAL-4.5-Ic-104.
Approved by the Release Manager.
2014-08-01 14:11:02 +02:00
2b6fa0076a
Merge branch 'BGL-fix_halfedge_edge_is_border_pmap-sloriot'
...
Tested in CGAL-4.5-Ic-105
Approved by the (interim) release manager
2014-07-24 20:41:06 +02:00
cc36cf8359
Merge branch 'boost-work_around_dijktra_bug_1.54-local'
...
Distribute dijktra header file from boost 1.55 to work around
a bug in the version 1.54. The header file is only used if the
user compiles with boost 1.54
Tested in CGAL-4.5-Ic-102
Approved by the release manager
Conflicts:
Installation/changes.html
2014-07-23 08:46:33 +02:00
cdec3d6414
make the edge_descriptor of Polyhedron hashable
2014-07-23 08:20:16 +02:00
926aa7500f
Set CMP0042 to OLD
...
That avoids a warning on MacOS.
2014-07-22 15:14:52 +02:00
3dd4069bf0
Fix a bug with CMake 3.0
...
Actually, in my opinion that was also a bug with other versions of
CMake.
Before this commit, in Installation/src, CGAL_CONFIGURED_LIBRARIES was
set to the empty string "" *in the parent scope* (Installation),
then the variable is modified in the current scope Installation/src, and
then the variable value is copied to a cache variable of the same name.
In my opinion, that means that the parent scope (Installation) has a
non-cache variable CGAL_CONFIGURED_LIBRARIES that is empty (""), and a
cache variable that is not empty (that contains, for example
"CGAL_Core;CGAL_Qt4;CGAL_ImageIO"). The document of CMake-3.0 precisely says
that the semantic of variables is such that cache variables have the
lowest priority. See:
http://www.cmake.org/cmake/help/v3.0/manual/cmake-language.7.html#variables
As far as I know, that was supposed to be the same for CMake 2.8, but I
cannot find out where it is described in the documentation. Anyway, the
bug was visible with CMake 2.8 and not with CMake 3.0.
The patch simply does not set the empty value of
CGAL_CONFIGURED_LIBRARIES in the parent scope, but only in the current
local scope.
2014-07-22 15:04:12 +02:00
4d468d1881
Add compatibility with CMake 3.0
...
Trivial bug-fix for master
2014-07-22 12:47:59 +02:00
5c6b54257a
the XXX_is_border properties are removed + add missing replacement functions
2014-07-22 12:00:15 +02:00
da77e0d819
Name of leda_numbers of Windows
...
Trivial fix for master
(cherry picked from commit 601d05d717edead7ea8396a0f723b715bbd9bdc6)
2014-07-21 14:00:59 +02:00
45f7298ce7
Merge branch 'Polyhedron_demo-import_splatting-GF'
...
Tested in CGAL-4.5-Ic-100
Approved by the release manager
Conflicts:
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin.cpp
Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
2014-07-21 08:23:36 +02:00
bc8e1f399d
workaround a bug in dijsktra algorithm in boost 1.54 affecting normal estimation
2014-07-19 12:20:29 +02:00
25f74f2a74
LEDA library numbers has been renamed to leda_numbers
...
trivial bugfix for master
2014-07-18 16:04:27 +02:00
fbf824c711
Merge branch 'Mesh_3-parallel-cjamin'
...
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3
Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
fce46e5164
document the removal of the surface reconstruction demo
2014-07-17 13:41:43 +02:00
ca70dd0bde
The parallel algorithms are experimental
2014-07-17 10:52:39 +02:00
6ed1ba826e
Merge branch 'to-be-tested/Stop_testing_taucs-sloriot'
...
Taucs, Lapack and Blas supports are no longer tested
Approved by the Release Manager
Tested in CGAL-4.5-Ic-97
Conflicts:
Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-07-16 20:19:21 +02:00
b6aeb7cc66
Store CGAL_DISABLE_GMP in CGALConfig.cmake...
...
... and use it in UseCGAL/CGAL_Macros, to avoid re-enabling GMP by
error.
2014-07-09 15:39:44 +02:00
0f5fc963b4
Support QUIETLY in FindTBB.cmake
2014-07-09 15:36:25 +02:00
16441b0f6d
Merge branch 'Surface_modeling-integration_with_BGL-GF'
...
Introduces the Surface modeling package that allows
to deform a triangulated surface mesh
Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager
Conflicts:
Installation/changes.html
2014-07-08 19:53:36 +02:00
2aadba50d7
Merge branch 'BGL-redesign_final-GF'
...
Introduces a redesign of the CGAL extension of the BGL API
Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager
Conflicts:
Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
2014-07-08 19:45:16 +02:00
ec9c796552
remove exe flag
2014-07-04 17:24:06 +02:00
fd123ac130
cosmetic change
2014-07-04 14:54:10 +02:00
8cbca4f4b3
update changes.html
2014-07-04 13:55:42 +02:00
0b353bb85b
Merge remote-tracking branch 'origin/CGAL-use_leda-GF'
...
Reintroduce the possibility to use CGAL without GMP
(to use LEDA number types instead for example).
The cmake option to set to switch off GMP when building
the lib is CGAL_DISABLE_GMP.
Tested in CGAL-4.5-Ic-86
Approved by the release manager
ge is necessary,
2014-07-04 12:02:37 +02:00
c0c9c1c090
update changes.html
2014-07-04 11:29:25 +02:00
a25bc04512
On Fedora, users of TBB may need pthread
2014-07-03 18:45:36 +02:00
43d000c256
remove non longer needed Taucs only files
2014-07-03 14:20:46 +02:00
c726cedbbb
As BOOST_NO_CXX11_RANGE_BASED_FOR has been introduced with Boost 1.51
...
we need a CGAL macro
2014-07-03 09:24:20 +02:00
b9cd9d198c
LEDA_INC_DIR is a PATH, not a FILEPATH
2014-07-02 14:16:21 +02:00
6cb21d7b18
changes.html updated
2014-07-01 19:19:10 +02:00
7f95ce6906
Merge remote-tracking branch 'origin/Intersections-fix_do_intersect_Bbox_3_Triangle_3-GF' into BGL-redesign_final-GF
2014-07-01 16:48:50 +02:00
e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
09993c7feb
Updated changes.html (Mesh_3, Triangulation_3, STL_extension)
2014-06-30 21:10:51 +02:00
Andreas Fabri
Laurent Rineau
Sébastien Loriot
Clement Jamin
Remy Thomasse
Sylvain Brandel
Dmitry Anisimov
Jane Tournois
m.overtheil