From dabb8d9df44f363e55da4e60df6f7ded876118d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Tue, 5 Dec 2017 17:14:00 +0100 Subject: [PATCH] Aligned P3M3 license file (apply a89784027bb) --- .../include/CGAL/license/Periodic_3_mesh_3.h | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Installation/include/CGAL/license/Periodic_3_mesh_3.h b/Installation/include/CGAL/license/Periodic_3_mesh_3.h index a697caa883d..7216497ed5f 100644 --- a/Installation/include/CGAL/license/Periodic_3_mesh_3.h +++ b/Installation/include/CGAL/license/Periodic_3_mesh_3.h @@ -12,6 +12,10 @@ // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. // +// $URL$ +// $Id$ +// SPDX-License-Identifier: LGPL-3.0+ +// // Author(s) : Andreas Fabri // // Warning: this file is generated, see include/CGAL/licence/README.md @@ -22,9 +26,6 @@ #include #include - - - #ifdef CGAL_PERIODIC_3_MESH_3_COMMERCIAL_LICENSE # if CGAL_PERIODIC_3_MESH_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE @@ -37,8 +38,8 @@ # ifdef CGAL_LICENSE_ERROR # error "Your commercial license for CGAL does not cover this release \ -of the 3D Periodic Mesh Generation package. \ -You get this error, as you defined CGAL_LICENSE_ERROR." + of the 3D Periodic Mesh Generation package. \ + You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR # endif // CGAL_PERIODIC_3_MESH_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE @@ -46,15 +47,17 @@ You get this error, as you defined CGAL_LICENSE_ERROR." #else // no CGAL_PERIODIC_3_MESH_3_COMMERCIAL_LICENSE # if defined(CGAL_LICENSE_WARNING) - CGAL_pragma_warning("You use the CGAL 3D Periodic Mesh Generation package under " + CGAL_pragma_warning("\nThe macro CGAL_PERIODIC_3_MESH_3_COMMERCIAL_LICENSE is not defined." + "\nYou use the CGAL 3D Periodic Mesh Generation package under " "the terms of the GPLv3+.") # endif // CGAL_LICENSE_WARNING # ifdef CGAL_LICENSE_ERROR -# error "You use the CGAL 3D Periodic Mesh Generation package under the terms of \ -the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." +# error "The macro CGAL_PERIODIC_3_MESH_3_COMMERCIAL_LICENSE is not defined.\ + You use the CGAL 3D Periodic Mesh Generation package under the terms of \ + the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR #endif // no CGAL_PERIODIC_3_MESH_3_COMMERCIAL_LICENSE -#endif // CGAL_LICENSE_CHECK_PERIODIC_3_MESH_3_H +#endif // CGAL_LICENSE_PERIODIC_3_MESH_3_H