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

Merge branch 'CGAL-6.0-beta1'

This commit is contained in:
Laurent Rineau 2024-06-21 18:46:46 +02:00
parent 4393517f22 78a4865416
commit 29ed736571
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,12 @@
#define CGAL_VERSION_H #define CGAL_VERSION_H
#ifndef SWIG #ifndef SWIG
#define CGAL_VERSION 6.0-beta1 #define CGAL_VERSION 6.0-beta2
#define CGAL_GIT_HASH abcdef #define CGAL_GIT_HASH abcdef
#endif #endif
#define CGAL_VERSION_NR 1060000910 #define CGAL_VERSION_NR 1060000920
#define CGAL_SVN_REVISION 99999 #define CGAL_SVN_REVISION 99999
#define CGAL_RELEASE_DATE 20240601 #define CGAL_RELEASE_DATE 20240701
#include <CGAL/version_macros.h> #include <CGAL/version_macros.h>

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

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

2
Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py
View File

@ -18,7 +18,7 @@ actions = {
"Thursday": integration, "Thursday": integration,
"Friday": release("5.5"), "Friday": release("5.5"),
"Saturday": release("5.6"), "Saturday": release("5.6"),
"Sunday": beta_release_from_master(1), "Sunday": beta_release_from_master(2),
} }