Laurent Rineau
c5d7200d7a
Fix a typo, to really test TBB
2021-10-06 14:34:51 +02:00
Laurent Rineau
84f707c7f1
Merge branch '5.3.x-branch'
2021-10-06 12:05:04 +02:00
Marius Kintel
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
Mael Rouxel-Labbé
521c72d57e
Fix typos
2021-10-04 13:34:07 +02:00
Sebastien Loriot
c63677d1c9
Update Installation/CHANGES.md
...
Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
2021-10-01 09:19:41 +02:00
Sébastien Loriot
6efafcb35d
update changes
2021-09-30 17:38:48 +02:00
Laurent Rineau
67546b22c9
Fix PR #5853
...
This patch actually somehow revert #5853 , and surrounds the two
`install` commands with `if(CGAL_BRANCH_BUILD)`.
2021-09-29 17:50:04 +02:00
Laurent Rineau
804feece28
Merge pull request #5761 from danston/Weights-unification-danston
...
[Small Feature] Weights Unification
2021-09-29 16:59:34 +02:00
Laurent Rineau
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
Laurent Rineau
1d93575865
Merge pull request #6007 from lrineau/Installation-fix_CGAL_pointmatcher_support.cmake-GF
...
Fix CGAL_pointmatcher_support.cmake
2021-09-29 11:45:35 +02:00
Laurent Rineau
e5ab9202f5
Merge pull request #4229 from gdamiand/CGAL_data-gdamiand
...
Regroup data: scripts and function updates
2021-09-23 16:14:11 +02:00
Jane Tournois
4b3fee813f
ITK is not needed in c3t3_item, and find with the required components only
2021-09-23 14:46:40 +02:00
Laurent Rineau
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
Andreas Fabri
ff51ed4010
Update CHANGES.md
2021-09-21 09:53:10 +02:00
Sébastien Loriot
78b0b2afbd
add target def in generated files for install
2021-09-16 11:40:57 +02:00
Laurent Rineau
4bcbcfd9f2
Change the name of whitelisted header
2021-09-14 10:51:09 +02:00
Sebastien Loriot
4610cf3c66
Merge pull request #5904 from sloriot/CGAL-remove_config_flags
...
Replace macros with inline functions and remove a config flag
2021-09-10 17:38:50 +02:00
Dmitry Anisimov
936968fb4f
Merge remote-tracking branch 'origin/master' into Weights-unification-danston
2021-09-06 10:38:24 +02:00
Sébastien Loriot
6e1fc8a4e5
Merge remote-tracking branch 'cgal/master' into HEAD
2021-09-02 16:53:07 +02:00
Sebastien Loriot
6e4f55e1e5
Merge pull request #5407 from maxGimeno/T2-Document_projection_traits_3-maxGimeno
...
Triangulation_2 : Document the `Triangulation_2_projection_traits_3` class
2021-08-31 19:01:33 +02:00
Sébastien Loriot
e2fe528edf
move changes from 5.1 to 5.4
2021-08-30 15:17:19 +02:00
Sébastien Loriot
d8510d0fd3
follow up of #4009
2021-08-30 12:37:20 +02:00
Sébastien Loriot
4454c5b3ed
Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno
2021-08-30 12:25:51 +02:00
Sébastien Loriot
4ea7b65a24
manual move for boost headers
2021-08-26 11:42:01 +02:00
Sébastien Loriot
98e471849b
moving files from internal to PKG/internal
2021-08-26 11:33:39 +02:00
Sebastien Loriot
d944777495
Merge pull request #5808 from danston/Shape_detection-Region_growing_on_spheres-GF
...
[Small Feature] Region Growing on Spheres and Cylinders
2021-08-25 19:38:06 +02:00
Sebastien Loriot
7e212770e5
Merge pull request #5738 from danston/Barycentric_coordinates_2-danston
...
[Feature] Barycentric Coordinates 2 Revision
2021-08-25 19:35:36 +02:00
Dmitry Anisimov
2246c4dcef
Merge remote-tracking branch 'origin/master' into Shape_detection-Region_growing_on_spheres-GF
2021-08-16 10:27:39 +02:00
Dmitry Anisimov
916e03657d
fixed typo
2021-08-14 18:39:13 +02:00
Dmitry Anisimov
60804d738e
Merge remote-tracking branch 'origin/master' into Weights-unification-danston
2021-08-14 18:34:47 +02:00
Sébastien Loriot
f6b656bb3b
update changes
2021-08-13 18:25:31 +02:00
Sébastien Loriot
de6d8c6cbd
Merge pull request #5742 from danston/Shape_regularization-new_package-danston
...
[Feature] Shape Regularization New Package
2021-08-13 18:19:35 +02:00
Sébastien Loriot
e16e75c273
Merge pull request #5861 from sloriot/PMP-coref_vertex_visitor
...
Add vertex related functions in corefinement visitor
2021-08-13 18:17:39 +02:00
Sébastien Loriot
6481cb23d9
remove CXX11 config variables related to threads
2021-08-13 16:44:53 +02:00
Sébastien Loriot
63a764b79c
remove some cpp0x and cpp11 config macros
2021-08-13 16:25:40 +02:00
Sébastien Loriot
00fd00fafc
replace macros with inline functions and remove a config flag
2021-08-13 15:24:41 +02:00
Dmitry Anisimov
650fc04303
Merge remote-tracking branch 'origin/master' into Barycentric_coordinates_2-danston
2021-08-13 11:34:58 +02:00
Dmitry Anisimov
2990bdb72a
the heat method change is a breaking change
2021-08-13 10:28:37 +02:00
Dmitry Anisimov
3029957c39
added heat method change to the changes.md
2021-08-13 10:26:41 +02:00
Sebastien Loriot
8d8afe6870
Merge pull request #5737 from danston/Weights-new_package-danston
...
[Feature] Weights New Package
2021-08-12 10:48:03 +02:00
Sebastien Loriot
8d00945943
Merge pull request #5655 from danston/PSP-libpointmatcher_enhancements-danston
...
[Small Feature] Support for libpointmatcher::GenericDescriptorOutlierFilter
2021-08-12 10:10:13 +02:00
Maxime Gimeno
f7df517f57
Merge remote-tracking branch 'cgal/master' into T2-Document_projection_traits_3-maxGimeno
2021-08-09 09:14:23 +02:00
Dmitry Anisimov
76050b2595
Merge remote-tracking branch 'origin/master' into Barycentric_coordinates_2-danston
2021-08-04 15:52:02 +02:00
Mael
5a30c321b8
Misc cleaning
2021-08-04 15:42:04 +02:00
Dmitry Anisimov
933940435a
Merge remote-tracking branch 'origin/master' into Shape_regularization-new_package-danston
2021-08-04 15:30:10 +02:00
Dmitry Anisimov
50157a7479
Merge remote-tracking branch 'origin/master' into Weights-new_package-danston
2021-08-04 15:12:04 +02:00
Efi Fogel
5e73fe1eba
Merge remote-tracking branch 'cgal/master' into Aos_2-boundary_objects-efic
2021-08-04 12:22:09 +03:00
Laurent Rineau
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
Laurent Rineau
5759a800e3
Merge pull request #5705 from maxGimeno/CGAL-Clean_up_boost_versions-maxGimeno
2021-07-28 10:14:38 +02:00
Laurent Rineau
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
Laurent Rineau
04b690b099
Merge pull request #5736 from danston/Kernel_23-add_centroid_2_and_determinant_2-danston
...
Projection Traits With Centroid 2 and Determinant 2
2021-07-27 16:25:09 +02:00
Dmitry Anisimov
8e1fad7818
Merge remote-tracking branch 'origin/Weights-new_package-danston' into Barycentric_coordinates_2-danston
2021-07-27 16:23:33 +02:00
Dmitry Anisimov
59e9cf071f
Merge remote-tracking branch 'origin/Kernel_23-add_centroid_2_and_determinant_2-danston' into Weights-new_package-danston
2021-07-27 16:21:50 +02:00
Dmitry Anisimov
b3ffe456ad
updated tabs
2021-07-27 16:21:22 +02:00
Dmitry Anisimov
b31174bd72
Merge remote-tracking branch 'origin/Kernel_23-add_centroid_2_and_determinant_2-danston' into Weights-new_package-danston
2021-07-27 16:19:46 +02:00
Laurent Rineau
b1ccf3fee3
Merge pull request #5402 from mglisse/mt-glisse
...
Epeck thread safety
2021-07-27 15:55:25 +02:00
Laurent Rineau
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
Laurent Rineau
d4cff65ac4
Merge pull request #5853 from lrineau/Installation-fix_install_without_demos-GF
...
Do not install demo/resources and demo/icons
2021-07-27 15:55:18 +02:00
Laurent Rineau
6d30aee7f8
Merge pull request #5859 from lrineau/Installation-fix_compatiblity_with_CMP0064-GF
...
Set CMP0064 to fix #5857
2021-07-27 15:55:16 +02:00
Laurent Rineau
b8fcb87482
Merge pull request #5853 from lrineau/Installation-fix_install_without_demos-GF
...
Do not install demo/resources and demo/icons
2021-07-27 15:52:30 +02:00
Dmitry Anisimov
db8976d457
updated changes.md
2021-07-27 15:36:32 +02:00
Maxime Gimeno
97cac65a86
Fix __GNUC__ tests
2021-07-23 10:59:49 +02:00
Laurent Rineau
af14540751
Use THREADS_PREFER_PTHREAD_FLAG
2021-07-22 17:05:43 +02:00
Sébastien Loriot
f153a1ed3e
Merge remote-tracking branch 'cgal/master' into HEAD
2021-07-22 13:15:22 +02:00
Maxime Gimeno
f8ebb77959
Fix test on CGAL_GCC_VERSION, that is 0 if the compiler is not GCC, not undefined
2021-07-21 14:21:05 +02:00
Sébastien Loriot
cb212c4ef4
update changes
2021-07-21 14:00:16 +02:00
Laurent Rineau
f9444fa85d
CGAL depends on threads-support... for all compilers!
2021-07-21 11:03:36 +02:00
Laurent Rineau
5b0e0936d5
Set CMP0064 to fix #5857
2021-07-20 11:52:18 +02:00
Marc Glisse
e7357ac003
Merge remote-tracking branch 'cgal/master' into mt-glisse
...
several PRs in Filtered_kernel conflicted with this :-(
2021-07-19 14:53:27 +02:00
Maxime Gimeno
b2c07c7841
fix config.h
2021-07-19 14:50:59 +02:00
Maxime Gimeno
049e1a7551
No more CGAL_NOEXCEPT
2021-07-19 14:29:51 +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
Sebastien Loriot
9b27f53b28
Merge pull request #5544 from maxGimeno/PMP-compare_faces_from_meshes-maxGimeno
...
PMP: compare_meshes
2021-07-19 07:54:00 +02:00
Laurent Rineau
f526f4941c
Do install demo/resources and demo/icons
...
They are copied in cmake/modules/demo/ anyway.
2021-07-15 16:28:22 +02:00
Dmitry Anisimov
ae0a1fd6d0
Merge remote-tracking branch 'origin/Shape_detection-fix_leaks_in_ransac-danston' into Shape_detection-Region_growing_on_spheres-GF
2021-07-08 17:31:45 +02:00
Maxime Gimeno
7721f034a8
update README.md
2021-07-08 11:42:02 +02:00
Laurent Rineau
6de515bedc
master targets CGAL-5.4-dev
2021-07-06 14:57:08 +02:00
Laurent Rineau
469d8afd5c
Next release in this branch will be 5.3.1
2021-07-06 14:53:04 +02:00
Laurent Rineau
e4f1530590
This branch now targets 5.2.4
2021-07-06 13:53:39 +02:00
Laurent Rineau
eea97d0885
Prepare the announcement of CGAL-5.3
2021-07-02 13:17:51 +02:00
Laurent Rineau
484ee4c6c4
Change the release name, from 5.3-beta2 to 5.3
...
...and prepare for the near publication of 5.1.5 and 5.2.3.
2021-07-02 12:46:43 +02:00
Dmitry Anisimov
cb9747b5b4
updated changes.md
2021-07-01 13:20:21 +02:00
Dmitry Anisimov
52016d1435
updated changes.md
2021-07-01 12:38:09 +02:00
Dmitry Anisimov
a96051fe7a
Merge remote-tracking branch 'origin/Solvers-add_osqp-danston' into Shape_regularization-new_package-danston
2021-07-01 11:38:01 +02:00
Dmitry Anisimov
866280215c
Merge remote-tracking branch 'origin/Weights-new_package-danston' into Barycentric_coordinates_2-danston
2021-07-01 11:28:57 +02:00
Dmitry Anisimov
23ca092355
added better breaking change in changes.md
2021-07-01 11:27:47 +02:00
Dmitry Anisimov
454072e82f
updated changes.md
2021-07-01 11:25:37 +02:00
Dmitry Anisimov
ef1fbc7161
updated changes.md
2021-07-01 11:17:23 +02:00
Dmitry Anisimov
f6c6c2ea24
updated changes.md
2021-07-01 10:45:02 +02:00
Dmitry Anisimov
1d2fcea164
remved small feature from changes text
2021-07-01 10:38:07 +02:00
Dmitry Anisimov
e401b0c03b
updated changes.md
2021-07-01 10:35:41 +02:00
Dmitry Anisimov
306c0534dd
updated changes.md
2021-07-01 10:20:53 +02:00
Laurent Rineau
7091735f33
Fix #5333
2021-06-30 16:00:28 +02:00
Maxime Gimeno
3ef2dbe915
Add the drop of the support of CGAL not header-only in CHANGES and update the doc about configuration and installation.
2021-06-29 13:16:42 +02:00
Dmitry Anisimov
c57619382c
updated changes.md
2021-06-28 19:13:38 +02:00
Dmitry Anisimov
672a6e8e30
Merge remote-tracking branch 'origin/Solvers-add_osqp-danston' into Shape_regularization-new_package-danston
2021-06-18 16:15:53 +02:00
Dmitry Anisimov
aaf55dbaa0
Merge remote-tracking branch 'maxGimeno/PMP-compare_faces_from_meshes-maxGimeno' into gsoc2019-PMPHDist-martinskrodzki
2021-06-18 14:45:24 +02:00
Dmitry Anisimov
94b75803c0
Merge branch 'master' into Solvers-add_osqp-danston
2021-06-18 10:02:11 +02:00
Dmitry Anisimov
8bc8f70bc5
fixed license files for three more packages running the new version of the script
2021-06-17 11:44:41 +02:00
Dmitry Anisimov
893ab175b9
fixed typo in the orthtree package description
2021-06-17 11:43:50 +02:00