songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This branch now targets a possible 5.4-beta2

This commit is contained in:
Laurent Rineau 2021-12-17 17:41:29 +01:00
parent 9f219fe387
commit c5d01fc96e
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/doc/resources/1.8.13/menu_version.js
View File

@ -3,7 +3,7 @@
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.3-beta1' var current_version_local = 'master'
var all_versions = [ var all_versions = [
'master', 'master',
'5.4-beta1', '5.4-beta1',

2
Documentation/doc/resources/1.8.14/menu_version.js
View File

@ -3,7 +3,7 @@
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.3-beta1' var current_version_local = 'master'
var all_versions = [ var all_versions = [
'master', 'master',
'5.4-beta1', '5.4-beta1',

2
Documentation/doc/resources/1.8.20/menu_version.js
View File

@ -3,7 +3,7 @@
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.3-beta1' var current_version_local = 'master'
var all_versions = [ var all_versions = [
'master', 'master',
'5.4-beta1', '5.4-beta1',

2
Documentation/doc/resources/1.8.4/menu_version.js
View File

@ -3,7 +3,7 @@
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.3-beta1' var current_version_local = 'master'
var all_versions = [ var all_versions = [
'master', 'master',
'5.4-beta1', '5.4-beta1',

2
Installation/CHANGES.md
View File

@ -4,7 +4,7 @@ Release History
[Release 5.4](https://github.com/CGAL/cgal/releases/tag/v5.4) [Release 5.4](https://github.com/CGAL/cgal/releases/tag/v5.4)
----------- -----------
Release date: December 2021 Release date: January 2022
### [General changes](https://doc.cgal.org/5.4/Manual/general_intro.html) ### [General changes](https://doc.cgal.org/5.4/Manual/general_intro.html)

4
Installation/include/CGAL/version.h
View File

@ -17,10 +17,10 @@
#define CGAL_VERSION_H #define CGAL_VERSION_H
#ifndef SWIG #ifndef SWIG
#define CGAL_VERSION 5.4-beta1 #define CGAL_VERSION 5.4-beta2
#define CGAL_GIT_HASH abcdef #define CGAL_GIT_HASH abcdef
#endif #endif
#define CGAL_VERSION_NR 1050400910 #define CGAL_VERSION_NR 1050400920
#define CGAL_SVN_REVISION 99999 #define CGAL_SVN_REVISION 99999
#define CGAL_RELEASE_DATE 20211215 #define CGAL_RELEASE_DATE 20211215

2
Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
View File

@ -2,7 +2,7 @@ set(CGAL_MAJOR_VERSION 5)
set(CGAL_MINOR_VERSION 4) set(CGAL_MINOR_VERSION 4)
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.4-beta1") set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.4-beta2")
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)