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

missing 6.0 updates 

# Conflicts:
#	Documentation/doc/resources/1.8.20/menu_version.js
#	Documentation/doc/resources/1.8.4/menu_version.js
#	Documentation/doc/resources/1.9.3/menu_version.js
This commit is contained in:
Sébastien Loriot 2023-04-28 23:08:22 +02:00 committed by Laurent Rineau
parent 5564cb247f
commit 29b84248f8
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,8 @@
var current_version_local = 'master' var current_version_local = 'master'
var all_versions = [ var all_versions = [
'master', 'master',
'5.6-beta1', '6.0-beta1',
'5.6',
'latest', 'latest',
'5.5.2', '5.5.2',
'5.4.4', '5.4.4',

3
Documentation/doc/resources/1.9.6/menu_version.js
View File

@ -6,7 +6,8 @@
var current_version_local = 'master' var current_version_local = 'master'
var all_versions = [ var all_versions = [
'master', 'master',
'5.6-beta1', '6.0-beta1',
'5.6',
'latest', 'latest',
'5.5.2', '5.5.2',
'5.4.4', '5.4.4',

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

@ -1,8 +1,8 @@
set(CGAL_MAJOR_VERSION 5) set(CGAL_MAJOR_VERSION 6)
set(CGAL_MINOR_VERSION 6) set(CGAL_MINOR_VERSION 0)
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.6-beta1") set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0-beta1")
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)