Prepare for 5.2 final version

This commit is contained in:
Laurent Rineau 2020-12-18 15:56:29 +01:00
parent 7aac83302e
commit 485e672c26
6 changed files with 12 additions and 12 deletions

View File

@ -3,10 +3,10 @@
var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; 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 url_local = /.*\/doc_output\//;
var current_version_local = '5.2-beta1' var current_version_local = '5.2'
var all_versions = [ var all_versions = [
'master', 'master',
'5.2-beta1', '5.2',
'latest', 'latest',
'5.1.1', '5.1.1',
'5.0.4', '5.0.4',

View File

@ -3,10 +3,10 @@
var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; 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 url_local = /.*\/doc_output\//;
var current_version_local = '5.2-beta1' var current_version_local = '5.2'
var all_versions = [ var all_versions = [
'master', 'master',
'5.2-beta1', '5.2',
'latest', 'latest',
'5.1.1', '5.1.1',
'5.0.4', '5.0.4',

View File

@ -3,10 +3,10 @@
var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; 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 url_local = /.*\/doc_output\//;
var current_version_local = '5.2-beta1' var current_version_local = '5.2'
var all_versions = [ var all_versions = [
'master', 'master',
'5.2-beta1', '5.2',
'latest', 'latest',
'5.1.1', '5.1.1',
'5.0.4', '5.0.4',

View File

@ -3,10 +3,10 @@
var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; 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 url_local = /.*\/doc_output\//;
var current_version_local = '5.2-beta1' var current_version_local = '5.2'
var all_versions = [ var all_versions = [
'master', 'master',
'5.2-beta1', '5.2',
'latest', 'latest',
'5.1.1', '5.1.1',
'5.0.4', '5.0.4',

View File

@ -17,12 +17,12 @@
#define CGAL_VERSION_H #define CGAL_VERSION_H
#ifndef SWIG #ifndef SWIG
#define CGAL_VERSION 5.2-beta2 #define CGAL_VERSION 5.2
#define CGAL_GIT_HASH abcdef #define CGAL_GIT_HASH abcdef
#endif #endif
#define CGAL_VERSION_NR 1050200920 #define CGAL_VERSION_NR 1050201000
#define CGAL_SVN_REVISION 99999 #define CGAL_SVN_REVISION 99999
#define CGAL_RELEASE_DATE 20201116 #define CGAL_RELEASE_DATE 20201221
#include <CGAL/version_macros.h> #include <CGAL/version_macros.h>

View File

@ -2,7 +2,7 @@ set(CGAL_MAJOR_VERSION 5)
set(CGAL_MINOR_VERSION 2) set(CGAL_MINOR_VERSION 2)
set(CGAL_BUGFIX_VERSION 0) set(CGAL_BUGFIX_VERSION 0)
include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake)
set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.2-beta2") set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.2")
set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}") set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}")
if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0) if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0)