Commit Graph

2132 Commits

Author SHA1 Message Date
Sébastien Loriot e7563d3e05 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao'
Conflicts:
	Installation/changes.html
2015-07-09 17:30:24 +02:00
Sebastien Loriot 43de56ba21 Merge pull request #167 from afabri/AvoidMergeConflicts
Add place holders for the packages to be integrated
2015-07-09 10:33:23 +02:00
Laurent Rineau bbd6951161 Merge branch 'afabri/Advancing_front_surface_reconstruction-afabri' into CGAL-Qt5_support-GF
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp

There was also two "conceptual conflicts" that git-merge did not see,
in:
        Polyhedron/demo/Polyhedron/CMakeLists.txt
        Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp

Polyhedron/demo/Polyhedron/CMakeLists.txt had to use qt5_wrap_ui instead
of qt4_wrap_ui (that lead to a CMake error), and the declaration of the plugin in
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
was not using the Qt5 way (that lead to a compilation error)
2015-07-08 17:21:36 +02:00
Sébastien Loriot 0d431e39ab remove qt4 specific code 2015-07-07 18:00:43 +02:00
Sébastien Loriot 722abba27b cosmetic changes to remove mentions of QT4 2015-07-07 18:00:43 +02:00
Sébastien Loriot 89184387d6 remove no longer needed QT4 cmake scripts 2015-07-07 18:00:43 +02:00
Andreas Fabri 0401e17fc0 move to place holder 2015-07-07 16:46:32 +02:00
Andreas Fabri b2914e78d7 add empty line 2015-07-07 16:18:16 +02:00
Andreas Fabri 7e041bcc50 move to place holder 2015-07-07 15:58:58 +02:00
Andreas Fabri c09f7e86ef fix end of html comment 2015-07-07 14:59:36 +02:00
Andreas Fabri d26fdb17bf Add place holders for the packages to be integrated 2015-07-07 13:37:47 +02:00
Clement Jamin 3b8c24a4df Added the package 2015-07-07 12:06:46 +02:00
Laurent Rineau 49c2cdc19a Merge branch 'master' into sdglinf-philaris
Conflicts:
	Installation/changes.html
2015-07-06 18:33:08 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
2015-07-06 18:14:34 +02:00
Laurent Rineau 99f8b0d80e Allow to find QGLViewer-qt5 on Windows too 2015-07-06 17:29:39 +02:00
Andreas Fabri e6ad9a82b3 Add a wrapper for the changes entry of sdglinf-philaris 2015-07-06 11:01:21 +02:00
Sébastien Loriot 05e0900b3e update changes.html 2015-07-06 10:38:41 +02:00
Marc Glisse 253ec38a0a Announce new functors for alpha-shapes
As asked in the last comment of https://github.com/CGAL/cgal/pull/84
2015-07-05 16:07:24 +02:00
Sandeep Kumar Dey 5ac1311b01 updated announcement of new package sdg-linf 2015-07-03 17:32:45 +02:00
Sandeep Kumar Dey 6484a56485 announce the new feature sdg-linf 2015-07-03 17:21:51 +02:00
Sébastien Loriot a9fae2ea9b update changes 2015-07-03 16:28:22 +02:00
Laurent Rineau c21c9dda35 Merge pull request #141 from afabri/Advancing_front_surface_reconstruction-afabri
Advancing Front Surface Reconstruction, new package

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Advancing_front_surface_reconstruction
2015-07-03 16:26:28 +02:00
Philipp Möller 33a1fdbcbc Replace CGAL_LIBRARY with the actual CGAL target
The variable CGAL_LIBRARY is no longer defined within the build as it is
completely unnecessary and using the actual target allows more features.
2015-07-03 12:30:23 +02:00
Michael Hemmer 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
Andreas Fabri c97f1e6d26 remove 2 empty lines 2015-07-02 12:55:46 +02:00
Andreas Fabri a900133057 move package in changes.html to avoid merge conflict 2015-07-02 12:52:54 +02:00
Jane Tournois 6dadd19bf6 add entry to changes.html 2015-07-01 18:21:16 +02:00
Maxime Gimeno a0e7a60973 Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
Conflicts:
	Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
	Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
	Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
	GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
	GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
	GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
	GraphicsView/demo/Generator/CMakeLists.txt
	GraphicsView/demo/GraphicsView/CMakeLists.txt
	GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
	GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
	GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
	GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
	GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
	GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
	GraphicsView/demo/Stream_lines_2/CMakeLists.txt
	GraphicsView/demo/Triangulation_2/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
	Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
	Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
	Polyhedron/demo/Polyhedron/Scene_plane_item.h
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
	Polyhedron/demo/Polyhedron/Scene_polylines_item.h
	Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
	Surface_mesher/demo/Surface_mesher/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
	Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
Philipp Möller ba9cf09f03 Do not compute ${lib}_LIBRARY_INSTALLED anymore
CGALConfig_installed.cmake does not use that variable anymore
2015-06-29 16:36:50 +02:00
Andreas Fabri 6b4acda559 Add Advancing Front Reconstruction to changes.html 2015-06-29 12:23:55 +02:00
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau b4875fc99a changes for CGAL-4.6.1 2015-06-25 14:58:30 +02:00
Laurent Rineau 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
Philipp Möller c95fd5d289 Do not compute ${LIBRARY_NAME}_LIBRARY anymore 2015-06-24 17:25:11 +02:00
Philipp Möller e7a6f80f05 Check for MSVC when defining library paths
We do not know the value of CGAL_AUTO_LINK_ENABLED yet because it is
defined by CGAL_GeneratorSpecificSettings.cmake but this is
equivalent. This is also not a problem, because CGAL_AUTO_LINK_ENABLED
is not user-editable and always enabled on MSVC.
2015-06-24 17:21:37 +02:00
Philipp Möller 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
Philipp Möller 3e0ce823ca Do not compute ${LIBRARY_NAME}_LIBRARY anymore
Fixes #47
2015-06-23 17:59:48 +02:00
Philipp Möller 8b6acec1b3 Use the LOCATION property to set _LIBRARY variables
Inspect the imported targets for information instead of using
configure_file.
2015-06-23 17:59:48 +02:00
Philipp Möller 9e807d8e2d Include the export files through CGALConfig 2015-06-23 16:30:46 +02:00
Philipp Möller 8f7e338f33 Create a build-tree and installation export file
Add an export-name to libraries created with collect_cgal_library and
use it in install(EXPORT). Fake the behavior of export(EXPORT) by
looking for created targets manually.
2015-06-23 16:27:58 +02:00
Laurent Rineau 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
Philipp Möller 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Laurent Rineau 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
Andreas Fabri 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
Laurent Rineau 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
Philipp Möller 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
Laurent Rineau c61663b6ca Merge branch 'releases/CGAL-4.6-branch' 2015-06-05 16:45:53 +02:00
Sébastien Loriot 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
Laurent Rineau cb385a771b Add -frounding-math for gcc 4 *and later*
Fix issue #104
2015-06-03 10:44:18 +02:00
Sébastien Loriot 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
Aymeric PELLE 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
Sébastien Loriot 35d0fe8f18 Merge remote-tracking branch 'cgal-dev/BGL-helpers-GF' into Ridges_3-BGL-GF 2015-05-27 18:16:11 +02:00
Sébastien Loriot bc68b74fa8 update changes 2015-05-19 17:00:46 +02:00
Efi Fogel 48ad84344f Recorded the changes in the 2D Minkowski sum package 2015-05-04 09:03:04 +03:00
Maxime Gimeno 7f3d6e35c5 Merging and integration of Polyhedron_Demo
- The Splatting has been deactivated
- The Scene_item class has a new member of type QOpenGLFunctions, allowing to use all shader functions without need for GLEW
2015-04-27 14:51:48 +02:00
Maxime Gimeno ed3298ee2f Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
2015-04-27 08:50:06 +02:00
Maxime Gimeno 89348a1ab9 cut_plugin fixed
- replaced the missing modified files by the originals
- added a reference to a vector of floats in traits so that it fills it instead of drawing the bboxes
2015-04-24 15:59:23 +02:00
Andreas Fabri 0657c51e75 Add change log entry 2015-04-24 09:11:52 +02:00
Sébastien Loriot cec447468d update changes.html 2015-04-24 08:58:01 +02:00
Sébastien Loriot b0d5a2eac7 fix changes 2015-04-22 18:07:10 +02:00
Sebastien Loriot faee08becd Merge pull request #56 from efifogel/Aos-Polycurve_tests-wkhan
Aos polycurve tests wkhan
2015-04-22 18:00:03 +02:00
Sébastien Loriot 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
Sébastien Loriot 3f9e312ad2 update changes 2015-04-22 10:35:26 +02:00
Sébastien Loriot ae9da903ea update changes.html 2015-04-17 11:50:06 +02:00
Sébastien Loriot 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
Sébastien Loriot fe203e8f78 update changes 2015-04-15 16:21:43 +02:00
Laurent Rineau 4a7a614e5d Allow to find QGLViewer-qt5_
Conflicts:
	Installation/cmake/modules/FindQGLViewer.cmake
2015-04-03 12:35:37 +02:00
Laurent Rineau 4eef28be7e Minimal version of Boost: 1.48 2015-04-01 17:31:17 +02:00
Laurent Rineau 7d4da6aee2 Add new additional versions of Boost (up to 1.69) 2015-04-01 17:28:30 +02:00
Maxime Gimeno fa430e5fc0 WORK IN PROGRESS 2015-03-31 11:05:17 +02:00
Maxime Gimeno 8b3cca50a0 Modifying to Qt5 2015-03-31 10:22:21 +02:00
Maxime Gimeno 52dc3b265d Merge remote-tracking branch 'remotes/cgal-public-dev/gsoc2014-CGAL-Qt5_support-vialon' into to-qt5
All CMake files modified by the branch 'gsoc2014-CGAL-Qt5_support-vialon' have been reset.

Conflicts:
	GraphicsView/demo/Polygon/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/CMakeLists.txt
	GraphicsView/src/CGAL_Qt4/GraphicsView.qtmoc.cmake
	Installation/cmake/modules/CGALConfig_binary.cmake.in
	Installation/cmake/modules/CGALConfig_install.cmake.in
	Installation/cmake/modules/CGAL_Macros.cmake
	Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
	Linear_cell_complex/demo/Linear_cell_complex/MainWindow.cpp
	Mesh_3/demo/Mesh_3/CMakeLists.txt
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/Polyhedron_demo_edit_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_demo_join_polyhedra_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene.cpp
	Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
	Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/MainWindow.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_average_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_cleaning_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_inside_out_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_local_spacing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_normal_estimation_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_off_plugin.cpp
	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
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_simplification_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_smoothing_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_xyz_plugin.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Polyhedron_demo_plugin_helper.cpp
	Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Scene.cpp
	Triangulation_3/demo/Triangulation_3/CMakeLists.txt
2015-03-30 16:02:51 +02:00
Maxime Gimeno 040458d248 Update of all the CMakeList and .cmake files for Qt5
Reasy for merging the cpp files from clone qt5
2015-03-30 15:34:17 +02:00
Michael Hemmer c22687c28a add Visibility package to changes.html 2015-03-26 16:48:21 +01:00
Laurent Rineau 4f26ed0853 CHange the release month to April 2015 2015-03-26 10:32:19 +01:00
Laurent Rineau 32ce6df3a0 Polish announcement and changes. Prepare 4.6. 2015-03-10 11:07:08 +01:00
Sébastien Loriot c81fc2be06 Merge branch 'master' of github.com:lrineau/cgal into lrineau-master
Conflicts:
	.gitignore
2015-03-05 00:54:57 +01:00
Laurent Rineau c866365d2a Update CHANGES with recent changes 2015-02-26 18:34:22 +01:00
Andreas Fabri 04fdf00d76 Add 2D Polyline Simplification; fix the description of Surface_mesh 2015-02-25 11:40:36 +01:00
Efi Fogel 71a1a4905b Added 2D Arrangement polycurve 2015-02-25 09:36:42 +02:00
Sébastien Loriot c3124cc572 add deprecation of Convex_hull_d 2015-02-24 11:31:41 +01:00
Sébastien Loriot 6f4accb6ef fix typos 2015-02-24 11:24:43 +01:00
Laurent Rineau 73c75212d4 CGAL-4.6 will be released in March 2015
+ update the text file CHANGES
2015-02-19 17:49:36 +01:00
Laurent Rineau bfff3a77a6 Reformat the white-space, to enforce 80 columns 2015-02-19 17:48:44 +01:00
Sébastien Loriot 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
Laurent Rineau e3de928e26 Fix the release date
+ reindent
+ update CHANGES
2015-02-12 17:32:28 +01:00
Sébastien Loriot 98a4fce6ee update changes 2015-02-12 17:19:29 +01:00
Jane Tournois 0b9169fd65 update changes.html 2015-02-12 17:09:14 +01:00
Andreas Fabri e08c28727c Add #defines to trick moc
(cherry picked from commit 5db9675db8)

Conflicts:
	Installation/include/CGAL/config.h
2015-01-26 16:25:58 +01:00
Laurent Rineau 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
Laurent Rineau 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
Andreas Fabri d444701fa0 Add that Kd_tree::begin(0/end() is not in the insertion order 2015-01-20 10:40:10 +01:00
Andreas Fabri 5db9675db8 Add #defines to trick moc 2015-01-19 17:54:26 +01:00