From a70f01ff3df63526910d34ca3f43de0eb3814839 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 14 Nov 2023 12:36:59 +0000 Subject: [PATCH] Deal with license check --- ...artition_3.h => Kinetic_shape_partition.h} | 28 +++++++++---------- .../include/CGAL/KSR/debug.h | 2 +- .../include/CGAL/KSR/enum.h | 2 +- .../include/CGAL/KSR/parameters.h | 2 +- .../include/CGAL/KSR/property_map.h | 2 +- .../include/CGAL/KSR/utils.h | 2 +- .../include/CGAL/Kinetic_shape_partition_3.h | 2 +- .../CGAL/Kinetic_shape_reconstruction_2.h | 2 +- .../CGAL/Kinetic_shape_reconstruction_3.h | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) rename Installation/include/CGAL/license/{Kinetic_shape_partition_3.h => Kinetic_shape_partition.h} (52%) diff --git a/Installation/include/CGAL/license/Kinetic_shape_partition_3.h b/Installation/include/CGAL/license/Kinetic_shape_partition.h similarity index 52% rename from Installation/include/CGAL/license/Kinetic_shape_partition_3.h rename to Installation/include/CGAL/license/Kinetic_shape_partition.h index f09e3c79ece..4a17f41e9f8 100644 --- a/Installation/include/CGAL/license/Kinetic_shape_partition_3.h +++ b/Installation/include/CGAL/license/Kinetic_shape_partition.h @@ -11,44 +11,44 @@ // // Warning: this file is generated, see include/CGAL/license/README.md -#ifndef CGAL_LICENSE_KINETIC_SHAPE_PARTITION_3_H -#define CGAL_LICENSE_KINETIC_SHAPE_PARTITION_3_H +#ifndef CGAL_LICENSE_KINETIC_SHAPE_PARTITION_H +#define CGAL_LICENSE_KINETIC_SHAPE_PARTITION_H #include #include -#ifdef CGAL_KINETIC_SHAPE_PARTITION_3_COMMERCIAL_LICENSE +#ifdef CGAL_KINETIC_SHAPE_PARTITION_COMMERCIAL_LICENSE -# if CGAL_KINETIC_SHAPE_PARTITION_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE +# if CGAL_KINETIC_SHAPE_PARTITION_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 Kinetic Shape Partition package.") + "this release of the Kinetic Shape Partition package.") # endif # ifdef CGAL_LICENSE_ERROR # error "Your commercial license for CGAL does not cover this release \ - of the 3D Kinetic Shape Partition package. \ + of the Kinetic Shape Partition package. \ You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR -# endif // CGAL_KINETIC_SHAPE_PARTITION_3_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE +# endif // CGAL_KINETIC_SHAPE_PARTITION_COMMERCIAL_LICENSE < CGAL_RELEASE_DATE -#else // no CGAL_KINETIC_SHAPE_PARTITION_3_COMMERCIAL_LICENSE +#else // no CGAL_KINETIC_SHAPE_PARTITION_COMMERCIAL_LICENSE # if defined(CGAL_LICENSE_WARNING) - CGAL_pragma_warning("\nThe macro CGAL_KINETIC_SHAPE_PARTITION_3_COMMERCIAL_LICENSE is not defined." - "\nYou use the CGAL 3D Kinetic Shape Partition package under " + CGAL_pragma_warning("\nThe macro CGAL_KINETIC_SHAPE_PARTITION_COMMERCIAL_LICENSE is not defined." + "\nYou use the CGAL Kinetic Shape Partition package under " "the terms of the GPLv3+.") # endif // CGAL_LICENSE_WARNING # ifdef CGAL_LICENSE_ERROR -# error "The macro CGAL_KINETIC_SHAPE_PARTITION_3_COMMERCIAL_LICENSE is not defined.\ - You use the CGAL 3D Kinetic Shape Partition package under the terms of \ +# error "The macro CGAL_KINETIC_SHAPE_PARTITION_COMMERCIAL_LICENSE is not defined.\ + You use the CGAL Kinetic Shape Partition package under the terms of \ the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR." # endif // CGAL_LICENSE_ERROR -#endif // no CGAL_KINETIC_SHAPE_PARTITION_3_COMMERCIAL_LICENSE +#endif // no CGAL_KINETIC_SHAPE_PARTITION_COMMERCIAL_LICENSE -#endif // CGAL_LICENSE_KINETIC_SHAPE_PARTITION_3_H +#endif // CGAL_LICENSE_KINETIC_SHAPE_PARTITION_H diff --git a/Kinetic_shape_reconstruction/include/CGAL/KSR/debug.h b/Kinetic_shape_reconstruction/include/CGAL/KSR/debug.h index c6dd2775935..0169313c01b 100644 --- a/Kinetic_shape_reconstruction/include/CGAL/KSR/debug.h +++ b/Kinetic_shape_reconstruction/include/CGAL/KSR/debug.h @@ -13,7 +13,7 @@ #ifndef CGAL_KSR_DEBUG_H #define CGAL_KSR_DEBUG_H -// #include +#include #if defined(WIN32) || defined(_WIN32) #define _NL_ "\r\n" diff --git a/Kinetic_shape_reconstruction/include/CGAL/KSR/enum.h b/Kinetic_shape_reconstruction/include/CGAL/KSR/enum.h index 53d4b63ede5..ac5824cbbe6 100644 --- a/Kinetic_shape_reconstruction/include/CGAL/KSR/enum.h +++ b/Kinetic_shape_reconstruction/include/CGAL/KSR/enum.h @@ -13,7 +13,7 @@ #ifndef CGAL_KSR_ENUM_H #define CGAL_KSR_ENUM_H -// #include +#include namespace CGAL { namespace KSR { diff --git a/Kinetic_shape_reconstruction/include/CGAL/KSR/parameters.h b/Kinetic_shape_reconstruction/include/CGAL/KSR/parameters.h index 0cbfa75d946..1e2fed92bec 100644 --- a/Kinetic_shape_reconstruction/include/CGAL/KSR/parameters.h +++ b/Kinetic_shape_reconstruction/include/CGAL/KSR/parameters.h @@ -13,7 +13,7 @@ #ifndef CGAL_KSR_PARAMETERS_H #define CGAL_KSR_PARAMETERS_H -// #include +#include namespace CGAL { namespace KSR { diff --git a/Kinetic_shape_reconstruction/include/CGAL/KSR/property_map.h b/Kinetic_shape_reconstruction/include/CGAL/KSR/property_map.h index 8bd4c200acc..d565d5ff436 100644 --- a/Kinetic_shape_reconstruction/include/CGAL/KSR/property_map.h +++ b/Kinetic_shape_reconstruction/include/CGAL/KSR/property_map.h @@ -13,7 +13,7 @@ #ifndef CGAL_KSR_PROPERTY_MAP_H #define CGAL_KSR_PROPERTY_MAP_H -// #include +#include // STL includes. #include diff --git a/Kinetic_shape_reconstruction/include/CGAL/KSR/utils.h b/Kinetic_shape_reconstruction/include/CGAL/KSR/utils.h index 80859fa443f..b82200e0dd4 100644 --- a/Kinetic_shape_reconstruction/include/CGAL/KSR/utils.h +++ b/Kinetic_shape_reconstruction/include/CGAL/KSR/utils.h @@ -13,7 +13,7 @@ #ifndef CGAL_KSR_UTILS_H #define CGAL_KSR_UTILS_H -// #include +#include // STL includes. #include diff --git a/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_partition_3.h b/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_partition_3.h index 4153c3b3ae0..eafe64696eb 100644 --- a/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_partition_3.h +++ b/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_partition_3.h @@ -13,7 +13,7 @@ #ifndef CGAL_KINETIC_SHAPE_PARTITION_3_H #define CGAL_KINETIC_SHAPE_PARTITION_3_H -#include +#include // Boost includes. #include diff --git a/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_reconstruction_2.h b/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_reconstruction_2.h index c05d5009941..791e5c34f19 100644 --- a/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_reconstruction_2.h +++ b/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_reconstruction_2.h @@ -13,7 +13,7 @@ #ifndef CGAL_KINETIC_SHAPE_RECONSTRUCTION_2_H #define CGAL_KINETIC_SHAPE_RECONSTRUCTION_2_H -//#include +#include #include diff --git a/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_reconstruction_3.h b/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_reconstruction_3.h index 4fe0cef7299..37f169819db 100644 --- a/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_reconstruction_3.h +++ b/Kinetic_shape_reconstruction/include/CGAL/Kinetic_shape_reconstruction_3.h @@ -13,7 +13,7 @@ #ifndef CGAL_KINETIC_SHAPE_RECONSTRUCTION_3_H #define CGAL_KINETIC_SHAPE_RECONSTRUCTION_3_H -#include +#include #include #include