From 1d9bebc6739e4380061d2ed0afe5f0c87a363490 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 13 Nov 2020 16:37:15 +0100 Subject: [PATCH] Prepare CGAL-5.2-beta1 --- Documentation/doc/resources/1.8.13/menu_version.js | 3 ++- Documentation/doc/resources/1.8.14/menu_version.js | 3 ++- Documentation/doc/resources/1.8.20/menu_version.js | 3 ++- Documentation/doc/resources/1.8.4/menu_version.js | 3 ++- Installation/include/CGAL/version.h | 6 +++--- Installation/lib/cmake/CGAL/CGALConfigVersion.cmake | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Documentation/doc/resources/1.8.13/menu_version.js b/Documentation/doc/resources/1.8.13/menu_version.js index eba433a78e4..d14792034ba 100644 --- a/Documentation/doc/resources/1.8.13/menu_version.js +++ b/Documentation/doc/resources/1.8.13/menu_version.js @@ -3,9 +3,10 @@ var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; var url_local = /.*\/doc_output\//; - var current_version_local = '5.0.3' + var current_version_local = '5.2-beta1' var all_versions = [ 'master', + '5.2-beta1', 'latest', '5.1', '5.0.3', diff --git a/Documentation/doc/resources/1.8.14/menu_version.js b/Documentation/doc/resources/1.8.14/menu_version.js index eba433a78e4..d14792034ba 100644 --- a/Documentation/doc/resources/1.8.14/menu_version.js +++ b/Documentation/doc/resources/1.8.14/menu_version.js @@ -3,9 +3,10 @@ var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; var url_local = /.*\/doc_output\//; - var current_version_local = '5.0.3' + var current_version_local = '5.2-beta1' var all_versions = [ 'master', + '5.2-beta1', 'latest', '5.1', '5.0.3', diff --git a/Documentation/doc/resources/1.8.20/menu_version.js b/Documentation/doc/resources/1.8.20/menu_version.js index eba433a78e4..d14792034ba 100644 --- a/Documentation/doc/resources/1.8.20/menu_version.js +++ b/Documentation/doc/resources/1.8.20/menu_version.js @@ -3,9 +3,10 @@ var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; var url_local = /.*\/doc_output\//; - var current_version_local = '5.0.3' + var current_version_local = '5.2-beta1' var all_versions = [ 'master', + '5.2-beta1', 'latest', '5.1', '5.0.3', diff --git a/Documentation/doc/resources/1.8.4/menu_version.js b/Documentation/doc/resources/1.8.4/menu_version.js index eba433a78e4..d14792034ba 100644 --- a/Documentation/doc/resources/1.8.4/menu_version.js +++ b/Documentation/doc/resources/1.8.4/menu_version.js @@ -3,9 +3,10 @@ var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; var url_local = /.*\/doc_output\//; - var current_version_local = '5.0.3' + var current_version_local = '5.2-beta1' var all_versions = [ 'master', + '5.2-beta1', 'latest', '5.1', '5.0.3', diff --git a/Installation/include/CGAL/version.h b/Installation/include/CGAL/version.h index f68383c3ed3..72eeff01863 100644 --- a/Installation/include/CGAL/version.h +++ b/Installation/include/CGAL/version.h @@ -17,12 +17,12 @@ #define CGAL_VERSION_H #ifndef SWIG -#define CGAL_VERSION 5.2 +#define CGAL_VERSION 5.2-beta1 #define CGAL_GIT_HASH abcdef #endif -#define CGAL_VERSION_NR 1050200000 +#define CGAL_VERSION_NR 1050200910 #define CGAL_SVN_REVISION 99999 -#define CGAL_RELEASE_DATE 20200908 +#define CGAL_RELEASE_DATE 20201116 #include diff --git a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake index c26d639b033..9e65b8420e0 100644 --- a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake +++ b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake @@ -2,7 +2,7 @@ set(CGAL_MAJOR_VERSION 5) set(CGAL_MINOR_VERSION 2) set(CGAL_BUGFIX_VERSION 0) include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake) -set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.2-dev") +set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.2-beta1") set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}") if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0)