diff --git a/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h b/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h index a539e1e4b5d..029a3da97ca 100644 --- a/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h +++ b/Constrained_triangulation_3/include/CGAL/Conforming_Delaunay_triangulation_3.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/Constrained_triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h b/Constrained_triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h index 93e03b2b6bd..361a2ee8c4e 100644 --- a/Constrained_triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h +++ b/Constrained_triangulation_3/include/CGAL/Constrained_Delaunay_triangulation_3.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/Installation/include/CGAL/license/Constrained_triangulation_3.h b/Installation/include/CGAL/license/Constrained_triangulation_3.h new file mode 100644 index 00000000000..55cd82e27b2 --- /dev/null +++ b/Installation/include/CGAL/license/Constrained_triangulation_3.h @@ -0,0 +1,54 @@ +// Copyright (c) 2016 GeometryFactory SARL (France). +// All rights reserved. +// +// This file is part of CGAL (www.cgal.org) +// +// $URL$ +// $Id$ +// SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial +// +// Author(s) : Andreas Fabri +// +// Warning: this file is generated, see include/CGAL/license/README.md + +#ifndef CGAL_LICENSE_CONSTRAINED_TRIANGULATION_3_H +#define CGAL_LICENSE_CONSTRAINED_TRIANGULATION_3_H + +#include +#include + +#ifdef CGAL_CONSTRAINED_TRIANGULATION_3_COMMERCIAL_LICENSE + +# if CGAL_CONSTRAINED_TRIANGULATION_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE + +# if defined(CGAL_LICENSE_WARNING) + + CGAL_pragma_warning("Your commercial license for CGAL does not cover " + "this release of the 3D Constrained Triangulations package.") +# endif + +# ifdef CGAL_LICENSE_ERROR +# error "Your commercial license for CGAL does not cover this release \ + of the 3D Constrained Triangulations package. \ + You get this error, as you defined CGAL_LICENSE_ERROR." +# endif // CGAL_LICENSE_ERROR + +# endif // CGAL_CONSTRAINED_TRIANGULATION_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE + +#else // no CGAL_CONSTRAINED_TRIANGULATION_3_COMMERCIAL_LICENSE + +# if defined(CGAL_LICENSE_WARNING) + CGAL_pragma_warning("\nThe macro CGAL_CONSTRAINED_TRIANGULATION_3_COMMERCIAL_LICENSE is not defined." + "\nYou use the CGAL 3D Constrained Triangulations package under " + "the terms of the GPLv3+.") +# endif // CGAL_LICENSE_WARNING + +# ifdef CGAL_LICENSE_ERROR +# error "The macro CGAL_CONSTRAINED_TRIANGULATION_3_COMMERCIAL_LICENSE is not defined.\ + You use the CGAL 3D Constrained Triangulations package under the terms of \ + the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." +# endif // CGAL_LICENSE_ERROR + +#endif // no CGAL_CONSTRAINED_TRIANGULATION_3_COMMERCIAL_LICENSE + +#endif // CGAL_LICENSE_CONSTRAINED_TRIANGULATION_3_H diff --git a/Installation/include/CGAL/license/README.md b/Installation/include/CGAL/license/README.md index d39cd5f9bfe..d7f36f03e60 100644 --- a/Installation/include/CGAL/license/README.md +++ b/Installation/include/CGAL/license/README.md @@ -1,3 +1,7 @@ To generate the `PACKAGE.h` files, from the file `gpl_package_list.txt`: - cmake -P generate_files.cmake + - enter the directory `Installation/include/CGAL/license` + - then type the following command: + ```shell + cmake -P generate_files.cmake + ``` diff --git a/Installation/include/CGAL/license/gpl_package_list.txt b/Installation/include/CGAL/license/gpl_package_list.txt index a66f7cdfea7..f1c86c92f98 100644 --- a/Installation/include/CGAL/license/gpl_package_list.txt +++ b/Installation/include/CGAL/license/gpl_package_list.txt @@ -13,6 +13,7 @@ Circular_kernel_2 2D Circular Geometry Kernel Circular_kernel_3 3D Spherical Geometry Kernel Classification Classification Cone_spanners_2 Cone-Based Spanners +Constrained_triangulation_3 3D Constrained Triangulations Convex_decomposition_3 Convex Decomposition of Polyhedra Convex_hull_2 2D Convex Hulls and Extreme Points Convex_hull_3 3D Convex Hulls @@ -20,7 +21,7 @@ Convex_hull_d dD Convex Hulls and Delaunay Triangulations Envelope_2 2D Envelopes Envelope_3 3D Envelopes GraphicsView CGAL and the Qt Graphics View Framework -Heat_method_3 The Heat Method +Heat_method_3 3D Heat Method Hyperbolic_triangulation_2 2D Hyperbolic Delaunay Triangulations Inscribed_areas Inscribed Areas Interpolation 2D and Surface Function Interpolation