Created
May 6, 2024 18:37
-
-
Save lrineau/5271666984da974d23daabcee09e63a7 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Installation/include/CGAL/license/Heat_method_3.h b/Installation/include/CGAL/license/Heat_method_3.h | |
| index 8e02b59f24a..e47cf0fce2c 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 <CGAL/config.h> | |
| #include <CGAL/license.h> | |
| - | |
| - | |
| - | |
| #ifdef CGAL_HEAT_METHOD_3_COMMERCIAL_LICENSE | |
| # if CGAL_HEAT_METHOD_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE | |
| @@ -28,13 +24,13 @@ | |
| # if defined(CGAL_LICENSE_WARNING) | |
| CGAL_pragma_warning("Your commercial license for CGAL does not cover " | |
| - "this release of the 3D Heat Method package.") | |
| + "this release of the The Heat Method package.") | |
| # endif | |
| # 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 The 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 | |
| @@ -43,16 +39,16 @@ You get this error, as you defined CGAL_LICENSE_ERROR." | |
| # if defined(CGAL_LICENSE_WARNING) | |
| CGAL_pragma_warning("\nThe macro CGAL_HEAT_METHOD_3_COMMERCIAL_LICENSE is not defined." | |
| - "\nYou use the CGAL 3D Heat Method package under " | |
| + "\nYou use the CGAL The Heat Method package under " | |
| "the terms of the GPLv3+.") | |
| # endif // CGAL_LICENSE_WARNING | |
| # 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 The 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/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/combinatorial_repair.h b/Installation/include/CGAL/license/Polygon_mesh_processing/combinatorial_repair.h | |
| index cf07529839b..4df76dbace5 100644 | |
| --- a/Installation/include/CGAL/license/Polygon_mesh_processing/combinatorial_repair.h | |
| +++ b/Installation/include/CGAL/license/Polygon_mesh_processing/combinatorial_repair.h | |
| @@ -9,8 +9,7 @@ | |
| // | |
| // Author(s) : Andreas Fabri | |
| // | |
| -// Warning: this file is generated, see include/CGAL/licence/README.md | |
| -// not entirely true due to the backward compatibility issue | |
| +// Warning: this file is generated, see include/CGAL/license/README.md | |
| #ifndef CGAL_LICENSE_POLYGON_MESH_PROCESSING_COMBINATORIAL_REPAIR_H | |
| #define CGAL_LICENSE_POLYGON_MESH_PROCESSING_COMBINATORIAL_REPAIR_H | |
| @@ -18,11 +17,6 @@ | |
| #include <CGAL/config.h> | |
| #include <CGAL/license.h> | |
| -// backward compatibility | |
| -#ifdef CGAL_POLYGON_MESH_PROCESSING_REPAIR_COMMERCIAL_LICENSE | |
| -#define CGAL_POLYGON_MESH_PROCESSING_COMBINATORIAL_REPAIR_COMMERCIAL_LICENSE CGAL_POLYGON_MESH_PROCESSING_REPAIR_COMMERCIAL_LICENSE | |
| -#endif | |
| - | |
| #ifdef CGAL_POLYGON_MESH_PROCESSING_COMBINATORIAL_REPAIR_COMMERCIAL_LICENSE | |
| # if CGAL_POLYGON_MESH_PROCESSING_COMBINATORIAL_REPAIR_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE | |
| 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 <CGAL/config.h> | |
| #include <CGAL/license.h> | |
| - | |
| - | |
| - | |
| #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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment