Laurent Rineau
3a223ebd1e
cmake_minimum_required(VERSION 3.12...3.29)
2024-06-06 20:19:44 +02:00
Laurent Rineau
28632f21fc
Merge branch 'master' into CGAL-Qt6-GF
...
# Conflicts:
# Installation/CHANGES.md
2023-09-14 17:40:05 +02:00
Laurent Rineau
09a4ac1ad7
cosmetic changes
2023-09-14 14:39:45 +02:00
Laurent Rineau
b01da56a56
remove occurrences of OpenGLWidgets in demos' CMake scripts
2023-09-13 17:13:39 +02:00
Laurent Rineau
67baec27a1
Fix Optimal_transportation_reconstruction_2_Demo
2023-09-13 15:37:01 +02:00
Sébastien Loriot
68bc244d02
Merge remote-tracking branch 'cgal/master' into HEAD
2023-08-24 14:14:12 +02:00
albert-github
93001308f4
Merge branch 'master' into feature/issue_7395
...
# Conflicts:
# Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
# Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
2023-08-18 11:10:42 +02:00
albert-github
4e5578d469
issue #7395 Improvement of layout of model relations
...
- based on review
2023-07-15 13:12:15 +02:00
Sébastien Loriot
125542eb62
Merge remote-tracking branch 'cgal/master'
2023-07-11 12:59:21 +02:00
albert-github
ee2a55279d
issue #7395 Improvement of layout of model relations
...
- Completed the cgalHasModel part
- corrected spelling of `Has Model` and `Is Model Of` to `Has model` and `Is model of`
2023-07-06 17:35:34 +02:00
Sébastien Loriot
b66afab814
Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD
2023-07-05 11:29:35 +02:00
Sébastien Loriot
f936680600
Merge remote-tracking branch 'cgal/master' into HEAD
2023-06-15 18:48:39 +02:00
Sébastien Loriot
9cdfe70abb
Merge remote-tracking branch 'sloriot/CGAL-toward_6.0'
2023-06-15 11:34:09 +02:00
Sébastien Loriot
9a0bdb5d96
boost::variant ---> std::variant
2023-06-15 10:57:10 +02:00
Sébastien Loriot
604dcdc435
boost::optional => std::optional
2023-06-15 10:57:09 +02:00
Sébastien Loriot
c1294a0eaa
boost::integral_constant ---> std::integral_constant
2023-04-29 09:42:15 +02:00
Laurent Rineau
0576e883f9
Merge branch 'CGAL-fix-Qt5-CMake-GF' into CGAL-Qt6-GF
...
# Conflicts:
# AABB_tree/demo/AABB_tree/CMakeLists.txt
# Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
# Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
# Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
# 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/Polygon/CMakeLists.txt
# GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
# GraphicsView/demo/Segment_Delaunay_graph_Linf_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/include/CGAL/Qt/DemosMainWindow_impl.h
# Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
# Installation/cmake/modules/CGAL_add_test.cmake
# Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
# Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
# Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
# Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
# Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake
# Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
# Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
# Triangulation_3/demo/Triangulation_3/CMakeLists.txt
# Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
2023-04-28 13:49:58 +02:00
Laurent Rineau
fe5a36c08e
fix all the CMakeLists.txt for Qt5
2023-04-27 17:27:37 +02:00
Sébastien Loriot
5726a0a255
boost::is_floating_point -> std::is_floating_point
...
boost::is_float
2023-04-23 22:37:07 +02:00
Andreas Fabri
0574c6ba4c
Change the remaining CMakeLists.txt [skip ci]
2023-04-20 16:35:14 +01:00
albert-github
2d60f46985
issue #7231 Improvement of layout of refines relations.
...
- Adjusted cgalRefines according to reviews
- Implemented it in all files
2023-03-14 17:37:50 +01:00
Laurent Rineau
5a20fd8567
Merge pull request #7238 from albert-github/feature/bug_author_consistency
...
Making description of author(s) of a package consistent
2023-02-24 16:14:43 +01:00
Laurent Rineau
a38a3fc93f
Merge pull request #7260 from afabri/CGAL-set_but_not_used-GF
...
Use CGAL_assertion_code()
2023-02-24 16:14:39 +01:00
Andreas Fabri
49f7a40593
Use CGAL_Assertion_code()
2023-02-09 09:42:55 +00:00
albert-github
57e900b47c
Making description of author(s) of a package consistent
...
- use `\cgalPckAuthor` in case of one author
- use of `\cgalPckAuthors` in case of multiple authors
- using in case of multiple authors always `, and `
- in the 1.9.6 `BaseDoxyfile.in` let the `\cgalPckAuthors` point to `\cgalPckAuthor` to get consistent output (not done for other versions as in the past the `ALIASES` could not call one another).
2023-02-02 18:40:44 +01:00
Mael
153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF
2023-01-27 22:09:02 +01:00
Laurent Rineau
5f8930db8c
Merge branch '5.5.x-branch'
...
# Conflicts:
# Convex_hull_2/test/Convex_hull_2/ch_test_CH.cpp
# Convex_hull_2/test/Convex_hull_2/ch_test_SC.cpp
# Convex_hull_2/test/Convex_hull_2/ch_test_SH.cpp
# Convex_hull_2/test/Convex_hull_2/ch_test_SS.cpp
# Straight_skeleton_2/include/CGAL/constructions/Straight_skeleton_cons_ftC2.h
# Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h
2023-01-27 21:16:14 +01:00
Laurent Rineau
c87c9f8a55
Merge pull request #7142 from afabri/OTR-fix_memory_leak-GF
...
Optimal Transport Reconstruction: Fix memory leak
2023-01-27 20:52:20 +01:00
Andreas Fabri
03bd5302f8
Print the result
2023-01-13 08:13:20 +00:00
Andreas Fabri
793801cd8b
Fix conversion warning
2023-01-03 07:36:46 +00:00
Andreas Fabri
939a6a2b80
Make the demo work again
2023-01-02 13:17:17 +00:00
Andreas Fabri
01fd45b0a9
fixes
2022-12-22 15:12:02 +00:00
Andreas Fabri
d6ec19226d
Optimal Transport Reconstruction: Fix memory leak
2022-12-22 14:22:40 +00:00
Mael
6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF
2022-12-05 16:03:41 +01:00
albert-github
eed54a0ae5
spelling corrections
...
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
2022-11-15 18:45:39 +01:00
Andreas Fabri
fda8fa186c
OTR demo
2022-10-25 07:37:15 +01:00
Andreas Fabri
57535e2929
OTR
2022-10-14 10:27:25 +01:00
Mael Rouxel-Labbé
9b265fddf8
Uniformize REQUIRED / QUIET usage:
...
Following this:
- CGAL: always REQUIRED
- CGAL component: COMPONENT / OPTIONAL_COMPONENT (never QUIET)
- required 3rd party: (not QUIET) + message(NOTICE "") on NOT_FOUND
- optional 3rd party: QUIET + message(STATUS "") except for Polyhedron/demo
- 3rd party components: COMPONENT / OPTIONAL_COMPONENT
(QUIET depending on required or optional 3rd party)
2022-09-06 16:24:27 +02:00
Mael Rouxel-Labbé
7cb21c24b0
Uniformize message() for missing 3rd party libraries
...
STATUS for non-essential, NOTICE for important stuff
2022-09-06 16:07:31 +02:00
Laurent Rineau
2288225448
Massive update of CMake policies to version 3.23
2022-05-06 09:34:35 +02:00
Laurent Rineau
a92efe2704
Merge pull request #6213 from sloriot/OTR_2-doc
...
fix \cond \endcond mismatches
2022-01-04 16:31:20 +01:00
Sébastien Loriot
9847fd7e6e
fix \cond \endcond mismatches
2022-01-04 08:42:04 +01:00
Sébastien Loriot
ab48f63e30
update latest cmake version tested
2021-11-09 10:58:47 +01:00
Sébastien Loriot
f5d2fb28a2
remove artificial dependency to Polygon
2021-09-01 16:41:36 +02:00
Mael Rouxel-Labbé
78ff9185b3
Harmonize ASCII usage across all packages
2021-06-23 23:34:32 +02:00
Sebastien Loriot
b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
...
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno
c49152359c
update max version of cmake and announce the new minimal in CHANGE.md
2021-04-15 15:08:54 +02:00
Maxime Gimeno
17602e589e
Merge remote-tracking branch 'cgal/master' into CGAL-clang_tidy__nullptr_on_Mesh_2-GF
2021-04-07 09:17:51 +02:00
Maxime Gimeno
cc99fd94ad
Demo Pass
2021-02-19 16:02:12 +01:00
Dmitry Anisimov
81d9556707
Merge remote-tracking branch 'upstream/master' into Kernels-decltypes-danston
2021-02-10 10:06:45 +01:00