Mael Rouxel-Labbé
26eb7903aa
Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF
2020-06-18 12:46:46 +02:00
Mael Rouxel-Labbé
071565467d
Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF
2020-06-03 19:01:46 +02:00
Simon Giraudot
89285f1feb
Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF
2020-05-28 08:53:17 +02:00
Mael Rouxel-Labbé
038869cab9
Merge remote-tracking branch 'cgal/master' into CGAL-Improve_NP_doc_presentation-GF
2020-05-12 15:12:21 +02:00
Simon Giraudot
fefdd13f45
Merge remote-tracking branch 'mine/PSP-Cluster_points-GF' into PSP-Cluster_points-GF
2020-05-06 08:59:40 +02:00
Simon Giraudot
a94cb6bc1e
Add missing dependency
2020-04-27 10:06:16 +02:00
Sébastien Loriot
c5af2b25f3
Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'
2020-04-22 13:27:29 +02:00
Sébastien Loriot
157bdbda08
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
2020-04-22 13:26:52 +02:00
Simon Giraudot
589eb8c01f
Fix warnings with float kernel
2020-04-16 09:23:40 +02:00
Simon Giraudot
421096fd7f
Use imported targets everywhere
2020-04-15 14:06:13 +02:00
Mael Rouxel-Labbé
16092f53d6
Update doc about NPs
2020-04-05 17:56:11 +02:00
Mael Rouxel-Labbé
fc79510388
Regroup NP aliases into the base doxyfile.in
2020-04-04 17:26:32 +02:00
Sébastien Loriot
8bb22d5b2c
extra run of the script to remove tabs and trailing whitespaces
...
right after the merge of the 5.0 release branch
+ manual fix of the files (indentation was changed in the meantime):
* Spatial_sorting/include/CGAL/Multiscale_sort.h
* Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot
8b153fb495
Merge branch 'cgal/releases/CGAL-5.0-branch'
...
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot
0779373835
extra run of the script to remove tabs and trailing whitespaces
...
right after the merge of 4.14 release branch
+ manual fix on one line in:
* Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
* .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot
0a46621dc6
Merge branch 'cgal/releases/CGAL-4.14-branch'
...
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot
590612a563
run the script to remove tabs and trailing whitespaces
2020-03-26 13:25:16 +01:00
Simon Giraudot
6c8fd43ebb
Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization
2020-02-10 11:57:56 +01:00
Laurent Rineau
57779dd5c6
Merge pull request #4437 from sgiraudot/Point_set_3-Fix_missing_copy_constructor-GF
...
Point_set_3: add missing copy constructor
2020-01-15 17:31:52 +01:00
Laurent Rineau
9ece40051e
Merge pull request #4437 from sgiraudot/Point_set_3-Fix_missing_copy_constructor-GF
...
Point_set_3: add missing copy constructor
2020-01-15 17:19:25 +01:00
Simon Giraudot
e728b74ad6
Point_set_3: add missing copy constructor
2019-12-30 16:42:05 +01:00
Laurent Rineau
36f4dc03c5
Merge pull request #4333 from sgiraudot/Point_set-Better_IO_example-GF
...
Better IO example in Point_set_3
2019-11-06 17:45:26 +01:00
Maxime Gimeno
f4d2b7540a
fix warning
2019-11-05 15:57:16 +01:00
Sébastien Loriot
9a0bff4008
remove BOOST_FOREACH added by recent PRs
2019-11-04 10:59:15 +01:00
Simon Giraudot
3f58a277cd
Better IO example in Point_set_3
2019-10-31 09:37:57 +01:00
Sébastien Loriot
254d60f642
First pass on removing license notice in header for GPL files
2019-10-19 15:23:19 +02:00
Sébastien Loriot
7356421d80
introduce Commercial license SPDX tag
2019-10-19 12:15:19 +02:00
Sébastien Loriot
9bd9c68b83
update LGPL[23]+ and GPL[23]+ SPDX tags
...
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Sébastien Loriot
25a05e9f4c
Merge branch 'CGAL-named_function_parameters-4.14' into master
...
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot
2f81a21523
Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
...
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sebastien Loriot
667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
...
match @{ and @}
2019-07-18 16:26:43 +02:00
Sébastien Loriot
560c77f567
rename named function parameter class
2019-07-15 06:25:02 +02:00
Laurent Rineau
dc02598a5c
Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
...
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Sébastien Loriot
983645a51a
match @{ and @}
2019-07-05 21:49:46 +02:00
Sébastien Loriot
55bbb8e9e9
lazy doc fix
2019-06-28 10:07:40 +02:00
Laurent Rineau
5538543faf
Update dependencies
2019-06-21 11:27:02 +02:00
Guillaume Damiand
5dac349b13
Add licence check
2019-06-20 12:33:37 +02:00
Guillaume Damiand
67307dcead
Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments.
2019-06-19 15:48:10 +02:00
Laurent Rineau
4fbf00fb8a
CMake>=3.13: opt for for new policies up to 3.15
2019-06-19 14:34:59 +02:00
Guillaume Damiand
af32499a14
Add doc for draw function, for point set 3 and polygon 2.
2019-06-19 13:11:04 +02:00
Guillaume Damiand
8a3cb666fd
Correct links to CGAL::draw functions.
2019-06-19 13:10:08 +02:00
Andreas Fabri
f7b7b9957f
Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF
2019-06-05 14:47:11 +02:00
Andreas Fabri
e2d19b0c8d
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-04 23:45:44 +02:00
Dmitry Anisimov
3738de08ed
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston
2019-05-23 10:38:45 +02:00
Laurent Rineau
90782d4b7f
Revert the merge of two pull-requests that target CGAL-4.14-branch
...
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Dmitry Anisimov
0ebebab1b8
shape detection dependent packages are fixed
2019-04-25 13:27:41 +02:00
Dmitry Anisimov
6e33c7b22b
Merge branch 'master' into Point_set_shape_detection_3-make_it_general_with_region_growing-danston
2019-04-24 10:34:23 +02:00
Simon Giraudot
207a432dfd
Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF
2019-04-23 12:08:44 +02:00
Dmitry Anisimov
13d0156482
fixed docs, references, biblio, and license
2019-04-22 13:06:20 +02:00
Simon Giraudot
717137e48f
Merge remote-tracking branch 'mine/Surface_mesh-PLY_IO-GF' into Surface_mesh-PLY_IO-GF
2019-04-09 15:11:58 +02:00