diff --git a/Installation/include/CGAL/license/Frechet_distance.h b/Installation/include/CGAL/license/Frechet_distance.h index 80af43ef22c..0ad83f173bf 100644 --- a/Installation/include/CGAL/license/Frechet_distance.h +++ b/Installation/include/CGAL/license/Frechet_distance.h @@ -24,12 +24,12 @@ # if defined(CGAL_LICENSE_WARNING) CGAL_pragma_warning("Your commercial license for CGAL does not cover " - "this release of the Frechet Distances package.") + "this release of the dD Frechet Distance package.") # endif # ifdef CGAL_LICENSE_ERROR # error "Your commercial license for CGAL does not cover this release \ - of the dD Frechet Distances package. \ + of the dD Frechet Distance package. \ You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR @@ -39,13 +39,13 @@ # if defined(CGAL_LICENSE_WARNING) CGAL_pragma_warning("\nThe macro CGAL_FRECHET_DISTANCE_COMMERCIAL_LICENSE is not defined." - "\nYou use the CGAL Polyline Distances package under " + "\nYou use the CGAL dD Frechet Distance package under " "the terms of the GPLv3+.") # endif // CGAL_LICENSE_WARNING # ifdef CGAL_LICENSE_ERROR # error "The macro CGAL_FRECHET_DISTANCE_COMMERCIAL_LICENSE is not defined.\ - You use the CGAL Polyline Distances package under the terms of \ + You use the CGAL dD Frechet Distance package under the terms of \ the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR diff --git a/Installation/include/CGAL/license/Heat_method_3.h b/Installation/include/CGAL/license/Heat_method_3.h index 8e02b59f24a..579d5bca179 100644 --- a/Installation/include/CGAL/license/Heat_method_3.h +++ b/Installation/include/CGAL/license/Heat_method_3.h @@ -11,16 +11,12 @@ // // Warning: this file is generated, see include/CGAL/license/README.md - #ifndef CGAL_LICENSE_HEAT_METHOD_3_H #define CGAL_LICENSE_HEAT_METHOD_3_H #include #include - - - #ifdef CGAL_HEAT_METHOD_3_COMMERCIAL_LICENSE # if CGAL_HEAT_METHOD_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE @@ -33,8 +29,8 @@ # ifdef CGAL_LICENSE_ERROR # error "Your commercial license for CGAL does not cover this release \ -of the 3D Heat Method package. \ -You get this error, as you defined CGAL_LICENSE_ERROR." + of the 3D Heat Method package. \ + You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR # endif // CGAL_HEAT_METHOD_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE @@ -49,10 +45,10 @@ You get this error, as you defined CGAL_LICENSE_ERROR." # ifdef CGAL_LICENSE_ERROR # error "The macro CGAL_HEAT_METHOD_3_COMMERCIAL_LICENSE is not defined.\ - You use the CGAL 3D Heat Method package under the terms of \ -the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." + You use the CGAL 3D Heat Method package under the terms of \ + the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR #endif // no CGAL_HEAT_METHOD_3_COMMERCIAL_LICENSE -#endif // CGAL_LICENSE_CHECK_HEAT_METHOD_3_H +#endif // CGAL_LICENSE_HEAT_METHOD_3_H diff --git a/Installation/include/CGAL/license/Isosurfacing_3.h b/Installation/include/CGAL/license/Isosurfacing_3.h index 345fae13a82..dcf0ef11aa4 100644 --- a/Installation/include/CGAL/license/Isosurfacing_3.h +++ b/Installation/include/CGAL/license/Isosurfacing_3.h @@ -9,7 +9,7 @@ // // Author(s) : Andreas Fabri // -// Warning: this file is generated, see include/CGAL/licence/README.md +// Warning: this file is generated, see include/CGAL/license/README.md #ifndef CGAL_LICENSE_ISOSURFACING_3_H #define CGAL_LICENSE_ISOSURFACING_3_H diff --git a/Installation/include/CGAL/license/Polygon_mesh_processing/Polyhedral_envelope.h b/Installation/include/CGAL/license/Polygon_mesh_processing/Polyhedral_envelope.h index a03dc32b4fc..13a34245bbf 100644 --- a/Installation/include/CGAL/license/Polygon_mesh_processing/Polyhedral_envelope.h +++ b/Installation/include/CGAL/license/Polygon_mesh_processing/Polyhedral_envelope.h @@ -24,12 +24,12 @@ # if defined(CGAL_LICENSE_WARNING) CGAL_pragma_warning("Your commercial license for CGAL does not cover " - "this release of the Polygon Mesh Processing - Polyhedral envelope package.") + "this release of the Polygon Mesh Processing - Polyhedral Envelope package.") # endif # ifdef CGAL_LICENSE_ERROR # error "Your commercial license for CGAL does not cover this release \ - of the Polygon Mesh Processing - Polyhedral envelope package. \ + of the Polygon Mesh Processing - Polyhedral Envelope package. \ You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR @@ -39,16 +39,16 @@ # if defined(CGAL_LICENSE_WARNING) CGAL_pragma_warning("\nThe macro CGAL_POLYGON_MESH_PROCESSING_POLYHEDRAL_ENVELOPE_COMMERCIAL_LICENSE is not defined." - "\nYou use the CGAL Polygon Mesh Processing - Polyhedral envelope package under " + "\nYou use the CGAL Polygon Mesh Processing - Polyhedral Envelope package under " "the terms of the GPLv3+.") # endif // CGAL_LICENSE_WARNING # ifdef CGAL_LICENSE_ERROR # error "The macro CGAL_POLYGON_MESH_PROCESSING_POLYHEDRAL_ENVELOPE_COMMERCIAL_LICENSE is not defined.\ - You use the CGAL Polygon Mesh Processing - Polyhedral envelope package under the terms of \ + You use the CGAL Polygon Mesh Processing - Polyhedral Envelope package under the terms of \ the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR -#endif // no CGAL_POLYGON_MESH_PROCESSING_ENVELOPE_COMMERCIAL_LICENSE +#endif // no CGAL_POLYGON_MESH_PROCESSING_POLYHEDRAL_ENVELOPE_COMMERCIAL_LICENSE #endif // CGAL_LICENSE_POLYGON_MESH_PROCESSING_POLYHEDRAL_ENVELOPE_H diff --git a/Installation/include/CGAL/license/Polygon_mesh_processing/locate.h b/Installation/include/CGAL/license/Polygon_mesh_processing/locate.h index 854b366ba54..ebd2bf82ac4 100644 --- a/Installation/include/CGAL/license/Polygon_mesh_processing/locate.h +++ b/Installation/include/CGAL/license/Polygon_mesh_processing/locate.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 GeometryFactory SARL (France). +// Copyright (c) 2016 GeometryFactory SARL (France). // All rights reserved. // // This file is part of CGAL (www.cgal.org) @@ -38,9 +38,9 @@ #else // no CGAL_POLYGON_MESH_PROCESSING_LOCATE_COMMERCIAL_LICENSE # if defined(CGAL_LICENSE_WARNING) - CGAL_pragma_warning("\nThe macro CGAL_POLYGON_MESH_PROCESSING_LOCATE_COMMERCIAL_LICENSE is not defined." - "\nYou use the CGAL Polygon Mesh Processing - Locate package under " - "the terms of the GPLv3+.") + CGAL_pragma_warning("\nThe macro CGAL_POLYGON_MESH_PROCESSING_LOCATE_COMMERCIAL_LICENSE is not defined." + "\nYou use the CGAL Polygon Mesh Processing - Locate package under " + "the terms of the GPLv3+.") # endif // CGAL_LICENSE_WARNING # ifdef CGAL_LICENSE_ERROR @@ -51,4 +51,4 @@ #endif // no CGAL_POLYGON_MESH_PROCESSING_LOCATE_COMMERCIAL_LICENSE -#endif // CGAL_LICENSE_CHECK_POLYGON_MESH_PROCESSING_LOCATE_H +#endif // CGAL_LICENSE_POLYGON_MESH_PROCESSING_LOCATE_H diff --git a/Installation/include/CGAL/license/Polygonal_surface_reconstruction.h b/Installation/include/CGAL/license/Polygonal_surface_reconstruction.h index 73f59580778..04e1917e060 100644 --- a/Installation/include/CGAL/license/Polygonal_surface_reconstruction.h +++ b/Installation/include/CGAL/license/Polygonal_surface_reconstruction.h @@ -11,16 +11,12 @@ // // Warning: this file is generated, see include/CGAL/license/README.md - #ifndef CGAL_LICENSE_POLYGONAL_SURFACE_RECONSTRUCTION_H #define CGAL_LICENSE_POLYGONAL_SURFACE_RECONSTRUCTION_H #include #include - - - #ifdef CGAL_POLYGONAL_SURFACE_RECONSTRUCTION_COMMERCIAL_LICENSE # if CGAL_POLYGONAL_SURFACE_RECONSTRUCTION_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE @@ -33,8 +29,8 @@ # ifdef CGAL_LICENSE_ERROR # error "Your commercial license for CGAL does not cover this release \ -of the Polygonal Surface Reconstruction package. \ -You get this error, as you defined CGAL_LICENSE_ERROR." + of the Polygonal Surface Reconstruction package. \ + You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR # endif // CGAL_POLYGONAL_SURFACE_RECONSTRUCTION_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE @@ -49,10 +45,10 @@ You get this error, as you defined CGAL_LICENSE_ERROR." # ifdef CGAL_LICENSE_ERROR # error "The macro CGAL_POLYGONAL_SURFACE_RECONSTRUCTION_COMMERCIAL_LICENSE is not defined.\ - You use the CGAL Polygonal Surface Reconstruction package under the terms of \ -the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." + You use the CGAL Polygonal Surface Reconstruction package under the terms of \ + the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR #endif // no CGAL_POLYGONAL_SURFACE_RECONSTRUCTION_COMMERCIAL_LICENSE -#endif // CGAL_LICENSE_CHECK_POLYGONAL_SURFACE_RECONSTRUCTION_H +#endif // CGAL_LICENSE_POLYGONAL_SURFACE_RECONSTRUCTION_H diff --git a/Installation/include/CGAL/license/gpl_package_list.txt b/Installation/include/CGAL/license/gpl_package_list.txt index 6fd1d5b9b42..791271f4ac9 100644 --- a/Installation/include/CGAL/license/gpl_package_list.txt +++ b/Installation/include/CGAL/license/gpl_package_list.txt @@ -20,7 +20,7 @@ Convex_hull_3 3D Convex Hulls Convex_hull_d dD Convex Hulls and Delaunay Triangulations Envelope_2 2D Envelopes Envelope_3 3D Envelopes -Frechet_distance dD Fréchet Distance +Frechet_distance dD Frechet Distance GraphicsView CGAL and the Qt Graphics View Framework Heat_method_3 3D Heat Method Hyperbolic_triangulation_2 2D Hyperbolic Delaunay Triangulations