Laurent Rineau
8eefb7f173
Merge branch 'master' into pr/lrineau/8273
2025-02-07 16:10:52 +01:00
Laurent Rineau
050677f002
add CMake option CGAL_with_benchmarks
2025-02-06 01:21:42 +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
Sébastien Loriot
b19515e1f8
Merge remote-tracking branch 'cgal/6.0.x-branch'
2025-01-24 08:09:18 +01:00
Sébastien Loriot
7720caa9dc
Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD
2025-01-24 08:08:33 +01:00
Sébastien Loriot
d8106aab4b
we now use ctest for testing + extra clean up
2025-01-22 11:42:50 +01:00
Laurent Rineau
d759e72d8d
third batch of modifications
2024-10-17 00:17:59 +02:00
Andreas Fabri
527569346e
CGAL: Modernize CMakeLists.txt
2024-10-08 17:02:41 +01:00
Laurent Rineau
3a223ebd1e
cmake_minimum_required(VERSION 3.12...3.29)
2024-06-06 20:19:44 +02:00
Laurent Rineau
bc62b53b38
Fix issue #8192
2024-05-23 18:41:04 +02:00
Laurent Rineau
95b83b1214
Merge pull request #7845 from puneetmatharu/patch-cgal-dont-override-build-testing
...
Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject
2023-11-29 17:22:54 +01:00
Puneet Matharu
7944441068
Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject.
2023-11-02 18:09:03 +00:00
Laurent Rineau
dea756ed0f
fix test/Installation on Windows
2023-11-01 21:29:41 +01:00
Laurent Rineau
a72ccf2089
Fix CMake error on Windows
...
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-6.0-Ic-73/Installation/TestReport_Christo_MSVC-2022-Preview-Release.gz
```
CMake Error at cmake/modules/CGAL_SetupGMP.cmake:73 (target_link_libraries):
The plain signature for target_link_libraries has already been used with
the target "test_gmp_mpfr_dll". All uses of target_link_libraries with a
target must be either all-keyword or all-plain.
The uses of the plain signature are here:
* test/Installation/CMakeLists.txt:54 (target_link_libraries)
Call Stack (most recent call first):
test/Installation/CMakeLists.txt:55 (use_CGAL_GMP_support)
```
2023-09-28 15:04:35 +02:00
Laurent Rineau
029d7a8fba
fix test/Installation tests on Windows
2023-09-20 16:50:48 +02:00
Laurent Rineau
b05e1e9e46
Remove UseCGAL.cmake
...
and our old CMake macros `use_lib` and `use_component`.
2023-09-14 17:32:55 +02:00
Laurent Rineau
48f37a14dc
remove occurrences of Qt5
2023-09-14 17:02:21 +02:00
Laurent Rineau
2f6d51b49b
Remove a few occurrences of CGAL_Qt5
...
... and replace by CGAL_Qt6
2023-09-14 16:33:20 +02:00
Sébastien Loriot
573de7f29e
Merge branch 'master'
2023-06-22 13:38:49 +02:00
Sébastien Loriot
0ee31a5d4f
remove extra parenthesis
2023-06-19 19:17:49 +02:00
Sébastien Loriot
bbc4d08ee0
Merge remote-tracking branch 'cgal/master' into HEAD
2023-06-15 10:47:07 +02:00
Sébastien Loriot
c8a88b9014
remove CGAL_static_assertion*
2023-06-15 10:42:10 +02:00
Laurent Rineau
5f8da0463d
Merge pull request #7505 from sloriot/Installation-fix_cmake_warning
...
Minimum version should be first
2023-06-09 16:26:20 +02:00
Sébastien Loriot
d1ddd62192
minimum version should be first
2023-06-09 09:20:03 +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
67441a3772
Convert all CMakeLists.txt to Qt6
2023-04-25 17:27:03 +02:00
Laurent Rineau
b8f23d4feb
Merge pull request #7255 from lrineau/CGAL-rename_ctest_test_names-GF
...
CGAL CTest support: rename the test names
2023-04-24 14:08:27 +02:00
Laurent Rineau
38823ee9c4
Merge pull request #7386 from janetournois/Installation-gmp-jtournois
...
Installation - add new possible GMP lib name for MSVC
2023-04-21 11:21:21 +02:00
Laurent Rineau
731a774a4f
Merge pull request #7386 from janetournois/Installation-gmp-jtournois
...
Installation - add new possible GMP lib name for MSVC
2023-04-21 11:18:56 +02:00
Jane Tournois
d4b5fec0a6
be verbose when loading succeeded
2023-04-13 16:40:15 +02:00
Jane Tournois
3077d8b657
remove useless definitions
2023-04-13 16:33:20 +02:00
Jane Tournois
3c6a4c16c4
add debug info for the testsuite
2023-04-13 16:17:22 +02:00
Jane Tournois
8fe0633fb5
add new possible gmp name for MSVC
...
gmp-10 was compiled with vcpkg and installed on Christo
2023-04-13 16:17:21 +02:00
Laurent Rineau
6df18b668c
CGAL CTest support: rename the test names
...
Now that CTest test names can contain whitespace, we can have
better looking names. That is also more practicle because we can now
copy-paste the target name in `compilation of <target_name>`.
2023-02-06 12:04:57 +01:00
Laurent Rineau
734c96e951
Merge branch 'master' into pr/lrineau/6558
2022-05-06 16:25:32 +02:00
Laurent Rineau
7c4e43ee1c
Merge pull request #6535 from sloriot/Test-remove_cmake_generator
...
remove mentions to CMAKE_GENERATOR in test scripts
# Conflicts:
# CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake
# Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake
2022-05-06 14:21:25 +02:00
Laurent Rineau
539e2852a1
Merge pull request #6535 from sloriot/Test-remove_cmake_generator
...
remove mentions to CMAKE_GENERATOR in test scripts
# Conflicts:
# CGAL_ipelets/demo/CGAL_ipelets/cgal_test_with_cmake
# Set_movable_separability_2/test/Set_movable_separability_2/cgal_test_with_cmake
2022-05-06 14:19:07 +02:00
Laurent Rineau
2288225448
Massive update of CMake policies to version 3.23
2022-05-06 09:34:35 +02:00
Sébastien Loriot
8e0ed828e7
remove mentions to CMAKE_GENERATOR in test scripts
2022-04-28 13:48:23 +02:00
Sébastien Loriot
3368b5af8c
restore usage of use-file in Installation test
...
the script uses add_executable and linking to some CGAL targets
are needed. As I can't test it I prefer restoring the old behavior
2021-11-11 15:33:19 +01:00
Sébastien Loriot
ab48f63e30
update latest cmake version tested
2021-11-09 10:58:47 +01:00
Sébastien Loriot
58181afcdb
remove useless include directives
2021-11-09 10:16:12 +01:00
Laurent Rineau
c5d7200d7a
Fix a typo, to really test TBB
2021-10-06 14:34:51 +02:00
Sébastien Loriot
98e471849b
moving files from internal to PKG/internal
2021-08-26 11:33:39 +02:00
Laurent Rineau
3b01cd01f1
Merge pull request #5685 from maxGimeno/Testsuite-enlarge_tst_gmp_and_mpfr_dll-maxGimeno
...
Testsuite: Fix gmp_and_mpfr_dll test
2021-05-18 17:06:59 +02:00
Maxime Gimeno
fb5c4aa595
Fix test
2021-05-06 11:54:18 +02:00
Maxime Gimeno
95036f79d2
Add another pair of dll names to the gmp_and_mpfr_dll test
2021-05-06 11:29:39 +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
Laurent Rineau
ab6145babc
Merge pull request #5501 from maxGimeno/CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno
...
CMake Fixes when CGAL_Core is disabled (5.2)
2021-03-03 17:20:55 +01:00
Maxime Gimeno
b4de351840
Merge branch 'CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.1-maxGimeno' into CGAL-CGAL-Disable_tests_that_use_gmp_if_not_found-5.2-maxGimeno
2021-03-02 10:16:01 +01:00