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
8fbb9c5eaf
Merge pull request #7129 from sloriot/CGAL-config_clean_up
...
Leopard is retired for quite some time now
2023-01-27 20:52:25 +01:00
226c009892
Leopard is retired for quite some time now
2022-12-20 08:35:28 +01:00
0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113
2022-12-06 22:21:06 +01:00
e8ec440859
Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
...
# Conflicts:
# STL_Extension/doc/STL_Extension/CGAL/Concurrent_compact_container.h
2022-12-05 14:51:31 +01:00
67b5c791e9
Merge pull request #7075 from MaelRL/CGAL-Fix_some_links-GF
...
Update some links + https
2022-12-05 12:22:06 +01:00
da0b13699c
Merge branch 'master' into Kernel-Compare_distance_3_RT_FT__always_Filtered_predicate_RT_FT-GF
2022-12-02 23:19:29 +01:00
5c943e558c
Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
...
Fix autotest_cgal_with_ctest
2022-11-25 10:15:07 +01:00
b363b7e4af
Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
...
Fix autotest_cgal_with_ctest
2022-11-25 10:14:18 +01:00
b5c21e1f5d
Http -> https + update some dead links
2022-11-23 18:54:37 +01:00
9d709b12e5
spelling corrections
...
After review
2022-11-21 10:40:28 +01:00
45478184de
spelling corrections
...
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
ea35fa8f88
Fix autotest_cgal_with_ctest
...
That commit makes the CMake variables `CGAL_TEST_SUITE` (the new one)
and `RUNNING_CGAL_AUTO_TEST` (the legacy one) completely equivalent.
2022-10-05 15:06:02 +02:00
26fbe0196f
Merge pull request #6850 from janetournois/CGAL-boost_min_version-GF
...
Installation - update minimal valid Boost version
2022-10-04 13:53:19 +02:00
3529588796
Partial revert of 7c92341be7 (no C++17)
2022-09-22 21:41:02 +02:00
26f44ea271
update minimal valid boost version
2022-09-15 13:50:15 +01:00
7c92341be7
Introduce CGAL_Kernel_pred_RT_or_FT
...
This commit introduces a new kind of predicate in
`<CGAL/Kernel/interface_macros.h>`. In addition to
- `CGAL_kernel_pred` for predicates,
- `CGAL_Kernel_pred_RT` for predicates that can be implemented using a
ring-type,
now there is also:
- `CGAL_Kernel_pred_RT_or_FT` for predicates with multiple overloads of
`operator()`, some needing a field type and other needing a ring type
(without the division operator).
The C++ code can discriminate between the two cases with a special wrapper
for the return type: `CGAL::Needs_FT<result_type` instead of `result_type`
(defined in `<CGAL/tags.h>`.
In `<CGAL/Filtered_predicate.h>`, in addition to the usual class template
`Filtered_predicate`, there is now also `Filtered_predicate_RT_FT` that
takes three predicates as template parameters instead of two:
- the exact predicate with an ring-type,
- the exact predicate with a field-type,
- the approximate predicate (with `Interval_nt` as number-type).
For the moment, only `Compare_distance_3` in
`<CGAL/Cartesian/function_objects.h>` is using the new
`Filtered_predicate_RT_FT`.
Before this commit, the file
`Kernel_23/test/Kernel_23/include/CGAL/_test_new_3.h` was testing
`Compare_distance_3` only with three points or for points. This commit adds:
- a test with `Point_3, Point_3, Segment_3`, and
- a test with `Line_3, Point_3, Point_3`, that actually needs a field type
with its current implementation.
In the test `Kernel_23/test/Kernel_23/Filtered_cartesian.cpp`, the macro
`CGAL_NO_MPZF_DIVISION_OPERATOR` is defined, to remove the division operator
from `CGAL::Mpzf`. `CGAL::Mpzf` is a ring-type, even with its `operator/`
(because that `operator/` can only compute exact divisions), but with
`CGAL_NO_MPZF_DIVISION_OPERATOR` defined, that is now checked by the compiler.
2022-09-02 11:31:47 +02:00
79e064c9cf
Merge pull request #6692 from lrineau/CGAL-fix_cmake-GF
...
Cleanup CMake scripts
2022-07-24 18:08:38 +02:00
755c9d5d42
Merge pull request #6646 from lrineau/Installation-optional_ASAN-GF
...
Use ASAN optionally
2022-06-29 09:52:15 +02:00
ad54e34af1
`cmale_language(DEFER ...)` is actually from CMake 3.19
2022-06-21 21:59:55 +02:00
266b0ae15a
Fix the dependencies of CTest tests on compilation_of__CGAL_Qt5_moc_and_resources
2022-06-21 21:51:52 +02:00
a31a7b10eb
use `cmake_language(DEFER CALL..)` instead of `variable_watch`
2022-06-21 20:59:18 +02:00
5a038abf34
Fix a CMake bad code
...
https://cmake.org/cmake/help/latest/command/if.html#command:if
> `if(ENV{some_var})` will always evaluate to false.
2022-06-20 09:55:12 +02:00
b99f1afac6
Disable TBB when ASAN is used
2022-06-15 16:05:10 +02:00
35f29ecbe8
Use ASAN optionally
2022-06-07 12:00:30 +02:00
35ec6c83ac
Add CGAL include paths first
2022-05-19 14:38:35 +02:00
f237c761c2
Resore the requirement for CMake 3.11
2022-05-06 09:44:14 +02:00
2288225448
Massive update of CMake policies to version 3.23
2022-05-06 09:34:35 +02:00
55a3b3f1aa
Active CMake policies up to CMake-3.23
2022-05-06 09:28:17 +02:00
80c3baa196
/wd4503 is only for MSVC 2015
2022-05-05 16:09:51 +02:00
c00c481e06
Remove workarounds for CMake<3.11
2022-05-05 16:08:51 +02:00
cd1cdccd62
change the scope of imported targets
2021-11-02 11:01:38 +01:00
c59405342a
add target for generated files
2021-11-01 12:38:48 +01:00
ca89949169
Merge pull request #5597 from lrineau/Mesh_3-weighted_images-GF
...
Mesh_3: Add weighted images
2021-10-29 17:01:33 +02:00
0498cace68
add and use CGAL_ITK_support.cmake
2021-10-29 12:27:04 +02:00
fb9333f0d0
Merge pull request #6028 from MaelRL/CGAL-Fix_typos-GF
...
Fix typos
2021-10-07 14:27:21 +02:00
3f369718be
Bugfix: ORIGINAL_CMAKE_MODULE_PATH was set to PARENT_SCOPE and later referenced in the current scope
...
In the `cgal_setup_module_path` function, the intent is to set a few variables then later export them.
The ORIGINAL_CMAKE_MODULE_PATH variable, however, was set directly in the parent scope. When later trying to export it, it reads from the current scope, where the variable is empty as it hasn't yet been set.
This fix makes correctly sets the variable in the local scope the first time, making the export work as expected.
2021-10-04 16:13:30 -04:00
521c72d57e
Fix typos
2021-10-04 13:34:07 +02:00
458fa7c280
Merge pull request #6007 from lrineau/Installation-fix_CGAL_pointmatcher_support.cmake-GF
...
Fix CGAL_pointmatcher_support.cmake
2021-09-29 11:46:36 +02:00
e5ab9202f5
Merge pull request #4229 from gdamiand/CGAL_data-gdamiand
...
Regroup data: scripts and function updates
2021-09-23 16:14:11 +02:00
4b3fee813f
ITK is not needed in c3t3_item, and find with the required components only
2021-09-23 14:46:40 +02:00
9e30160ad0
Fix CGAL_pointmatcher_support.cmake
...
Fix https://github.com/CGAL/cgal/issues/5346
The quotes around `${libpointmatcher_LIBRARIES}` are harmful.
2021-09-22 14:39:34 +02:00
78b0b2afbd
add target def in generated files for install
2021-09-16 11:40:57 +02:00
4bcbcfd9f2
Change the name of whitelisted header
2021-09-14 10:51:09 +02:00
834c9d452b
Whitelist CGAL/Mesh_3/generate_weights_from_labeled_image.h
...
`CGAL/Mesh_3/generate_weights_from_labeled_image.h` depends on ITK and
cannot be tested automatically.
2021-07-29 10:32:00 +02:00
5759a800e3
Merge pull request #5705 from maxGimeno/CGAL-Clean_up_boost_versions-maxGimeno
2021-07-28 10:14:38 +02:00
4fb90756da
Merge pull request #5475 from sloriot/gsoc2019-PMPHDist-martinskrodzki
...
[Small Feature] Add bounded error Hausdorff distance
2021-07-27 16:28:04 +02:00
b1ccf3fee3
Merge pull request #5402 from mglisse/mt-glisse
...
Epeck thread safety
2021-07-27 15:55:25 +02:00
b9743fffa3
Merge pull request #5741 from danston/Solvers-add_osqp-danston
...
[Small Feature] OSQP Support in Solver Interface
2021-07-27 15:55:23 +02:00
97cac65a86
Fix __GNUC__ tests
2021-07-23 10:59:49 +02:00
Laurent Rineau
Sébastien Loriot
Mael
albert-github
Jane Tournois
Marius Kintel
Maxime Gimeno