bdd46e6978
Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer
...
Conflicts:
Documentation/biblio/cgal_manual.bib
Documentation/biblio/geom.bib
Installation/changes.html
2015-07-02 17:36:17 +02:00
76cf7e789f
Merge remote-tracking branch 'cgal/releases/CGAL-4.6-branch'
...
- Merge pull request #140 from
lrineau/Mesh_3-demo_fix_QGLViewer-2.6.0-lrineau
Fix for libQGLViewer>=2.6.0
Conflicts:
Installation/changes.html
2015-06-28 18:25:04 +02:00
9c37e3f1e8
Merge pull request #134 from bo0ts/Installation-fix-debugsymbol-removal-pmoeller
...
Do not check for the actual CMAKE_BUILD_TYPE
2015-06-28 18:20:39 +02:00
b4875fc99a
changes for CGAL-4.6.1
2015-06-25 14:58:30 +02:00
d4b4e1720b
Merge branch 'releases/CGAL-4.6-branch'
...
This merge imports the following merge commits:
- Merge pull request #132 from lrineau/Installation-fix_configure_component-pmoeller_rebased_4.6
- Merge pull request #126 from afabri/Triangulation_2-fix_plus_2-GF
- Merge pull request #125 from lrineau/Mesh_3-fix_with_gcc44_cpp11-lrineau
2015-06-25 11:28:30 +02:00
f0082c20f4
To not check for the actual CMAKE_BUILD_TYPE
...
If CMAKE_BUILD_TYPE is not set in the initial run, is only
defined *after* this code is run. Since the build type is cached this
seemed to work when a cmake cache was already present, but not without.
2015-06-24 11:39:47 +02:00
06a17381a6
Fix the use of get_filename_component
...
For CMake<=2.8.11, the option DIRECTORY must be renamed to PATH, the
legacy name of the option.
2015-06-23 11:22:01 +02:00
61e61220eb
Use get_filename_component to manipulate paths
...
This caused a bug in CMake>=3.3.0 when file(GLOB) is not adding multiple
slashes. The lack of trailing slashes is guaranteed and documented in
get_filename_component.
2015-06-23 11:13:09 +02:00
de7db3ca68
Merge pull request #111 from aympelle/Periodic_3_Delaunay_triangulation_traits_3-APelle
...
- Rename `Periodic_3_triangulation_traits_3` to `Periodic_3_Delaunay_triangulation_traits_3`.
- Rename the concept `Periodic_3TriangulationTraits_3` to `Periodic_3DelaunayTriangulationTraits_3`.
- Create `Periodic_3_triangulation_traits_3`.
- Create the concept `Periodic_3TriangulationTraits_3`.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/rename_p3tt3_p3dtt3
2015-06-17 09:59:33 +02:00
cce0d3ec64
Merge pull request #100 from sloriot/gsoc2014-Polyhedron_shortest_path-skiazyk
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polyhedron_shortest_path
This package provides methods to compute the surface-constrained shortest path on 3d models. It was written as a project during GSoC 2014.
2015-06-15 10:45:25 +02:00
71207cac07
Merge pull request #116 from sloriot/gsoc2014-VCM_3-jmeyron
...
GSoC 2014, VCM feature from Jocelyn Meyron, Sébastien Loriot, and Quentin Mérigot
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/vcm_computation_and_applications
2015-06-15 10:37:29 +02:00
447c5fd2af
Merge pull request #69 from efifogel/MS_2-of_holes-efif
...
Add in `Minvoski_sum_2`:
- handling of polygons with holes,
- the new "reduced convolution" implementation.
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Minkowski_sum_2_polygons_with_holes_and_RC
2015-06-10 12:24:00 +02:00
6dc9d60577
Merge pull request #114 from bo0ts/Installation-nodebug_when_testing-pmoeller
...
Remove the -g flag in testsuites (when `RUNNING_CGAL_AUTO_TEST` is `TRUE` in CMake).
2015-06-10 12:02:08 +02:00
40c629a3b4
Merge pull request #90 from janetournois/Mesh_2-add_optimizers-GF
...
Add optimizer methods in Mesh_2
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/lloyd_optimize_mesh_2
2015-06-10 11:57:53 +02:00
661ec3f606
Merge pull request #101 from afabri/Ridges_3-BGL-GF
...
Make `Ridge_3` work for any `FaceGraph` (concept from our BGL API).
2015-06-10 11:52:37 +02:00
0321e244b1
Merge branch 'Ridges_3-BGL-GF-old' into Ridges_3-BGL-GF
...
Conflicts:
Installation/changes.html
2015-06-08 14:36:15 +02:00
648ccb1510
CMake>=2.6.3 is required
...
I have tested: with CMake-2.6.2, there is a configuration error:
CMake Error: Error in cmake code at
/home/lrineau/Git/cgal/Installation/cmake/modules/CGAL_Macros.cmake:213:
Parse error. Function missing ending ")". Instead found left paren with text "(".
With CMake-2.6.3, that works.
2015-06-08 14:09:51 +02:00
1ce3c68ec8
Remove the -g flag in testsuites
...
While it might seem cleaner to simply add the -g0 argument, removing -g
is safer: -g0 would need to be added after any possible -g flags. Since
CMake makes no guarantees how the COMPILE_OPTIONS of a target are
actually initialized and we cannot change them on an individual basis
this is not easy to achieve. Hence we strip the CXX_FLAGS of -g. This
also still allows specifying it manually through CGAL_CXX_FLAGS.
2015-06-08 11:17:09 +02:00
c61663b6ca
Merge branch 'releases/CGAL-4.6-branch'
2015-06-05 16:45:53 +02:00
c2cd87865e
Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
...
Conflicts:
Installation/changes.html
Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt
Point_set_processing_3/doc/Point_set_processing_3/examples.txt
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-04 11:27:56 +02:00
cb385a771b
Add -frounding-math for gcc 4 *and later*
...
Fix issue #104
2015-06-03 10:44:18 +02:00
d123ce5a47
Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk
...
Conflicts:
Documentation/biblio/geom.bib
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Documentation/doc/Documentation/packages.txt
Documentation/scripts/generate_how_to_cite.py
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-01 17:47:31 +02:00
ded08221ae
Update changes.html.
...
Rename Periodic_3_triangulation_traits_3
Periodic_3_Delaunay_triangulation_traits_3.
Rename the concept Periodic_3TriangulationTraits_3
Periodic_3DelaunayTriangulationTraits_3.
Create Periodic_3_triangulation_traits_3.
Create the concept Periodic_3TriangulationTraits_3.
2015-05-29 20:04:34 +02:00
35d0fe8f18
Merge remote-tracking branch 'cgal-dev/BGL-helpers-GF' into Ridges_3-BGL-GF
2015-05-27 18:16:11 +02:00
bc68b74fa8
update changes
2015-05-19 17:00:46 +02:00
48ad84344f
Recorded the changes in the 2D Minkowski sum package
2015-05-04 09:03:04 +03:00
0657c51e75
Add change log entry
2015-04-24 09:11:52 +02:00
cec447468d
update changes.html
2015-04-24 08:58:01 +02:00
b0d5a2eac7
fix changes
2015-04-22 18:07:10 +02:00
faee08becd
Merge pull request #56 from efifogel/Aos-Polycurve_tests-wkhan
...
Aos polycurve tests wkhan
2015-04-22 18:00:03 +02:00
a0fcac7d94
Merge branch 'Spatial_sorting-spatial_sorting_on_sphere-pmachado' of git://github.com/sloriot/cgal into sloriot-Spatial_sorting-spatial_sorting_on_sphere-pmachado
2015-04-22 17:41:53 +02:00
3f9e312ad2
update changes
2015-04-22 10:35:26 +02:00
ae9da903ea
update changes.html
2015-04-17 11:50:06 +02:00
3f6c6b3369
Merge branch 'Generator-more_point_generators-pmachado' of git://github.com/sloriot/cgal into sloriot-Generator-more_point_generators-pmachado
...
Conflicts:
Generator/doc/Generator/Generator.txt
Generator/doc/Generator/PackageDescription.txt
Generator/doc/Generator/examples.txt
Installation/changes.html
2015-04-15 16:25:34 +02:00
fe203e8f78
update changes
2015-04-15 16:21:43 +02:00
4eef28be7e
Minimal version of Boost: 1.48
2015-04-01 17:31:17 +02:00
7d4da6aee2
Add new additional versions of Boost (up to 1.69)
2015-04-01 17:28:30 +02:00
c22687c28a
add Visibility package to changes.html
2015-03-26 16:48:21 +01:00
4f26ed0853
CHange the release month to April 2015
2015-03-26 10:32:19 +01:00
32ce6df3a0
Polish announcement and changes. Prepare 4.6.
2015-03-10 11:07:08 +01:00
c81fc2be06
Merge branch 'master' of github.com:lrineau/cgal into lrineau-master
...
Conflicts:
.gitignore
2015-03-05 00:54:57 +01:00
c866365d2a
Update CHANGES with recent changes
2015-02-26 18:34:22 +01:00
04fdf00d76
Add 2D Polyline Simplification; fix the description of Surface_mesh
2015-02-25 11:40:36 +01:00
71a1a4905b
Added 2D Arrangement polycurve
2015-02-25 09:36:42 +02:00
c3124cc572
add deprecation of Convex_hull_d
2015-02-24 11:31:41 +01:00
6f4accb6ef
fix typos
2015-02-24 11:24:43 +01:00
73c75212d4
CGAL-4.6 will be released in March 2015
...
+ update the text file CHANGES
2015-02-19 17:49:36 +01:00
bfff3a77a6
Reformat the white-space, to enforce 80 columns
2015-02-19 17:48:44 +01:00
607929b069
Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch'
...
Conflicts:
Installation/changes.html
Maintenance/release_building/public_release_name
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2015-02-16 11:45:08 +01:00
e3de928e26
Fix the release date
...
+ reindent
+ update CHANGES
2015-02-12 17:32:28 +01:00
Michael Hemmer
Laurent Rineau
Philipp Möller
Andreas Fabri
Sébastien Loriot
Aymeric PELLE
Efi Fogel
Sebastien Loriot
Laurent Rineau