Commit Graph

169 Commits

Author SHA1 Message Date
Sébastien Loriot 825f77baaa add license include directives 2020-04-10 14:14:30 +02:00
Mael Rouxel-Labbé 3e365756ca Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2020-03-09 16:54:25 +01:00
Mael Rouxel-Labbé 844cd55f85 Add license files 2019-12-09 15:43:30 +01:00
Guillaume Damiand 90457b38c7 Update licences 2019-11-26 14:21:39 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +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 724e70b97f Merge pull request #3984 from LiangliangNan/master
New package 'Polygonal Surface Reconstruction' and an extension of 'Solver Interface'
2019-07-18 17:05:25 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Guillaume Damiand 1dbc088459 Update licences; move undocumented files to internal (both directory and namespace) 2019-06-20 16:51:53 +02:00
Guillaume Damiand 62167eb065 Add surface mesh topology package in gpl list 2019-06-20 16:13:42 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Liangliang Nan fadaee63a8 integrated PolyFit 2019-06-05 17:50:37 +02:00
Dmitry Anisimov 13d0156482 fixed docs, references, biblio, and license 2019-04-22 13:06:20 +02:00
Mael Rouxel-Labbé 52915956e3 Add PMP/locate.h 2019-04-19 08:39:02 +02:00
Maxime Gimeno 549568a954 Fix conflicts 2019-01-22 10:08:48 +01:00
Laurent Rineau f5a8686cf3 Merge pull request #3439 from aboudev/VSA-lingjie
New package: Surface_mesh_approximation
2019-01-22 09:17:35 +01:00
Maxime Gimeno d52718f312 Fix Conflicts 2019-01-21 10:03:31 +01:00
Mael Rouxel-Labbé 15fe22cc6d Micro fix to gpl.h.in and added licenses for HT_2 and P4HT_2
(re-generated all the licenses on the way)
2018-12-19 18:38:05 +01:00
Lingjie Zhu 73c2a418c6 fix SPDX license indentifier 2018-11-30 10:45:24 +01:00
Lingjie Zhu a4ef69a631 add package license 2018-11-30 15:24:16 +08:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Sébastien Loriot e179770aab add skeleton for collision detection in PMP 2018-10-09 10:28:43 +02:00
Maxime Gimeno 8d0a67095f Merge branch 'master' into IntrinsicFaceGraph-V2 2018-08-01 15:40:36 +02:00
Maxime Gimeno 4e8264b109 Merge CGAL/master to get rid of the dependency to QGLViewer 2018-06-11 12:10:57 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Andreas Fabri dd8bf1f4df Add a constructor and two functions to get started 2018-05-24 14:35:35 +01:00
Maxime Gimeno 8df643f390 update licenses 2018-05-17 10:20:56 +02:00
Mael Rouxel-Labbé b8df8ba29b Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-01-08 10:44:01 +01:00
Mael Rouxel-Labbé dabb8d9df4 Aligned P3M3 license file (apply a89784027b) 2017-12-05 17:14:00 +01:00
Mael Rouxel-Labbé ba3a59ed5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-11-30 15:54:00 +01:00
Efi Fogel 3b2110656e Renamed sweep_line to surface_sweep 2017-11-29 21:48:38 +02:00
Efi Fogel 7936109c6c Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
Conflicts:
	.travis.yml
	.travis/packages.txt
	Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
	Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h
	Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_batched_pl_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_vert_decomp_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_batched_pl_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_batched_pl_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_vert_decomp_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_default_planar_topology.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_basic_insertion_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_batched_pl_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_construction_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_default_overlay_traits_base.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_insertion_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_no_intersection_insertion_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_subcurve.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_vert_decomp_ss_visitor.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h
	CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp
	Documentation/doc/Documentation/dependencies
	Installation/include/CGAL/config.h
	Snap_rounding_2/include/CGAL/Snap_rounding_2.h
	Surface_sweep_2/examples/Surface_sweep_2/CMakeLists.txt
	Surface_sweep_2/include/CGAL/Surface_sweep_2/No_intersection_surface_sweep_2_impl.h
	Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_event_base.h
	Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_utils.h
	Surface_sweep_2/include/CGAL/Surface_sweep_2_algorithms.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_event.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h
	Sweep_line_2/include/CGAL/Sweep_line_empty_visitor.h
2017-11-16 16:31:52 +02:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot 31513a1f58 add missing PMP subpackage 2017-11-15 22:58:33 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Mael Rouxel-Labbé 1f4475d471 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2017-10-27 16:26:27 +02:00
Laurent Rineau f8c5efb9e3 Merge pull request #2373 from sgiraudot/Classification-GF
Classification (new package)
2017-09-22 15:18:52 +02:00
Laurent Rineau 037cba3fae Merge pull request #2336 from maxGimeno/Detect_features-GF
PMP: Detect features
2017-09-18 14:29:55 +02:00
Simon Giraudot 38663431a1 Merge branch 'Classification-GF-old' into Classification-GF 2017-09-11 11:53:13 +02:00
Laurent Rineau fda741e038 Merge pull request #2259 from efifogel/Set_movable_separability_2-tau
new package: 2D Movable Separability of Sets (2D Casting)
2017-09-08 17:40:40 +02:00
Simon Giraudot 97aefb29b6 Add license for Classification 2017-08-28 10:18:53 +02:00
Sébastien Loriot a89784027b update files 2017-08-24 14:19:56 +02:00
Sébastien Loriot f51f0cba1a update messages 2017-08-24 14:19:29 +02:00
Sébastien Loriot 7c6f6fc966 generate license files 2017-08-23 09:22:05 +02:00
Sébastien Loriot 1035aa802e display the name of the macro in the error and warning messages
this eases the creation of license.h file
2017-08-23 09:21:29 +02:00
Sébastien Loriot ab56ebb4e6 make PMP subpackage license file generated 2017-08-23 09:19:10 +02:00
Sébastien Loriot 1499c794a7 Add license include directives 2017-08-18 09:08:18 +02:00
Maxime Gimeno 3f57e98386 Add license file 2017-08-07 12:20:50 +02:00
Mael Rouxel-Labbé b58cfe0895 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov
Based on the P3RT3 branch
2017-05-29 10:15:19 +02:00
Efi Fogel 3e6de6b439 Renamed sweep-line to surface-sweep and cleaned up 2017-05-27 12:30:41 +03:00
Andreas Fabri cd7deb8577 License check for Corefinement and Distance 2017-03-22 12:32:43 +01:00
Andreas Fabri 774bdc4351 License check for Geometric Meshing and Hole Filling 2017-03-22 12:10:37 +01:00
Andreas Fabri 28da5ff545 Add license check files 2017-03-22 11:59:34 +01:00
Andreas Fabri fde105b437 License check for Predicates 2017-03-22 10:29:59 +01:00
Andreas Fabri 51bbe5d1f6 License check for Geometric Measures and Miscellaneous 2017-03-22 10:05:39 +01:00
Andreas Fabri d04b048aa9 License check for Connected Components 2017-03-22 09:21:27 +01:00
Andreas Fabri 44c1328f55 License check for Normal Computation Functions 2017-03-22 08:54:00 +01:00
Mael Rouxel-Labbé 3c645878b4 Added license file for P3M3 2017-03-17 12:22:31 +01:00
Sébastien Loriot d1e777efaa rename file 2017-01-26 10:34:24 +01:00
Sébastien Loriot 69e16f9c42 no longer use release_date.h 2017-01-19 16:33:19 +01:00
Sébastien Loriot eefa67f762 remove release_date.h and put the macro in version.h to be set by cmake
in the case of a release, it will be the date of the creation of the release
2017-01-19 16:32:31 +01:00
Sébastien Loriot 06dbf4da5d license headers are LGPL 2017-01-19 15:20:27 +01:00
Sébastien Loriot 6405807260 generate license headers
using:
cd Installation/include/CGAL/license
cmake -P generate_files.cmake
2017-01-19 15:20:24 +01:00
Laurent Rineau 680210cab5 Improvements
- move `CGAL_WARNING` in `<CGAL/config.h>`,

- create the macro `CGAL_pragma_warning`,

- use `CGAL_pragma_warning` to simplify `<CGAL/license/lgpl.h>` and
  `<CGAL/license/gpl.h.in>`.

- add messages in `include/CGAL/license/generate_files.cmake`

- add test files, that do nothing but can be modified to check errors
  and warning.
2017-01-19 15:20:23 +01:00
Sébastien Loriot 57c662ea3b generate include/CGAL/license/package_list.txt
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo -n "$i "
  pn=`grep cgalPkgDescriptionBegin $i/doc/$i/PackageDescription.txt  | \
  sed 's/\\\cgalPkgDescriptionBegin{\s*//' | \
  awk -F "," '{print $1}'`; echo $pn;
done > Installation/include/CGAL/license/package_list.txt
2017-01-19 15:20:23 +01:00
Sébastien Loriot 281fcc52b5 fix header 2017-01-19 15:20:22 +01:00
Sébastien Loriot 1ef0791a15 license_check -> licence and lower case header 2017-01-19 15:20:22 +01:00