Commit Graph

286 Commits

Author SHA1 Message Date
Laurent Rineau a2571bbab8 Merge remote-tracking branch 'lrineau/CGAL-followup_PR_8170-lrineau' into Triangulation_3-CDT_3-lrineau 2025-02-11 18:26:52 +01:00
Laurent Rineau e5001d1a50 update our CMake version 3.18...3.31
That will suppress the warnings about `CMP0167` (from CMake 3.30):

```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
  Policy CMP0167 is not set: The FindBoost module is removed.  Run "cmake
  --help-policy CMP0167" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.
```
2025-02-04 14:32:37 +01:00
Laurent Rineau 02632017a5 Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-11-12 12:33:37 +01:00
Sébastien Loriot fb605cdd39 remove -D that is not compatible with "older" cmake versions 2024-10-22 08:19:49 +02:00
Laurent Rineau 96cd3e6f09 Merge remote-tracking branch 'cgal/master' into pr/afabri/8528 2024-10-17 00:25:24 +02:00
Andreas Fabri 9e75ab340d Use add_compile_definitions 2024-10-09 11:58:52 +01:00
albert-github dd02af92a2 issue #8515 Spelling mistakes found checking `en-GB` to `en-US`
Spelling corrections, `en-GB` -> `en-US`
2024-10-05 11:28:29 +02:00
Sébastien Loriot 41b096c91a Merge remote-tracking branch 'cgal/5.6.x-branch' 2024-09-11 17:23:50 +02:00
Sébastien Loriot 4115afa3da Merge remote-tracking branch 'cgal/5.5.x-branch' 2024-09-10 13:51:15 +02:00
Sébastien Loriot 8448129a3a fix conditional compilation 2024-09-09 17:59:24 +02:00
Laurent Rineau ed4fb14f74 merge master (WIP: need #8273) 2024-07-01 16:38:56 +02:00
Laurent Rineau 3a223ebd1e cmake_minimum_required(VERSION 3.12...3.29) 2024-06-06 20:19:44 +02:00
Laurent Rineau b828719c7c Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-04-26 14:40:04 +02:00
Laurent Rineau 0fa27bc857 Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-04-24 16:51:27 +02:00
Andreas Fabri 6158ffa63e fix comment in demo 2024-04-17 10:50:13 +01:00
Laurent Rineau 873c3b26cf remove a few occurrences of "qt5"
There are still a lot!
2023-09-11 17:46:27 +02:00
Laurent Rineau 3a52549c41 more cleanup of CMake scripts for Qt6 2023-08-29 16:35:15 +02:00
Laurent Rineau a85ce74720 Merge branch 'Triangulation_3-fix_simplex_traverser-GF-CGAL-5.6' into Triangulation_3-CDT_3-lrineau 2023-06-22 15:28:48 +02:00
Sébastien Loriot 573de7f29e Merge branch 'master' 2023-06-22 13:38:49 +02:00
Andreas Fabri c6ce5fb120 Switch to QT6 for the GraphicsView demos 2023-04-19 12:19:38 +01:00
Mael Rouxel-Labbé 85911f1b64 Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-03-20 10:06:38 +01:00
Laurent Rineau 5c339515cf Merge branch 'CGAL-rename_ctest_test_names-GF' into Triangulation_3-CDT_3-lrineau
# Conflicts:
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
#	Triangulation_3/benchmark/Triangulation_3/CMakeLists.txt
2023-03-15 14:32:28 +01:00
Mael Rouxel-Labbé 68067c039f Merge remote-tracking branch 'cgal/master' into SLS-Weighted_skeleton-GF 2023-02-14 12:26:50 +01:00
Mael Rouxel-Labbé a346c80a4f Remove obsolete comment 2023-02-09 23:10:34 +01:00
Laurent Rineau cddb01ab68 Merge pull request #7253 from lrineau/Triangulation_2-improve-CDT_2_debugging-GF
STL_Extension/Triangulation_2: improve CDT_2 debug messages
2023-02-06 14:17:40 +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 afd56fe52b Merge pull request #7112 from afabri/T2_demo-read_WKT-GF
Triangulation_2 Demo: Read files with many WKT entities
2023-01-27 20:52:32 +01:00
Laurent Rineau bf6815256b move edg files to Data/data 2022-12-19 12:20:03 +01:00
Andreas Fabri 97be3701e1 Fix and locally tested 2022-12-14 08:20:56 +00:00
Andreas Fabri aa8da893c2 Fix and simplify code 2022-12-14 08:20:44 +00:00
Andreas Fabri 8da2cd9a34 Triangulation_2 Demo: Read files with many WKT entities 2022-12-14 08:20:26 +00:00
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01: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
Sébastien Loriot ad6329c263 Merge 'cgal/master' into gsoc2022-boost_np 2022-08-16 17:52:18 +02:00
Sébastien Loriot d13f486640 update tests/examples/demos to use the new API 2022-06-04 14:19:00 +02:00
Andreas Fabri 8204007c11 Use named parameters in demo 2022-05-18 10:08:57 +01:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Maxime Gimeno e6c767d5c9 Simplify the GNUC versions tests 2021-05-12 15:45:07 +02:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Sébastien Loriot 12f0e412b5 write_vtu -> write_VTU 2021-05-04 15:12:36 +02:00
Sébastien Loriot fb6f703b55 IO namespace for files in IO directories 2021-05-04 14:36:06 +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
Dmitry Anisimov 6346767cb2 added = default to the Lipschitz sizing field 2021-03-16 12:12:49 +01:00
Maxime Gimeno cc99fd94ad Demo Pass 2021-02-19 16:02:12 +01:00
Maxime Gimeno bebd60c12b Merge remote-tracking branch 'cgal/master' into Cmake_improvements-maxGimeno 2020-10-20 09:53:54 +02:00
Sebastien Loriot 9a9acceb10
Merge pull request #4761 from maxGimeno/GraphicsView-Fixes_for_Regular_triangulation_2-maxGimeno
GraphicsView: Regular_triangulation_2 enhancements
2020-10-02 15:20:20 +02:00