master will now target 6.1

This commit is contained in:
Laurent Rineau 2024-10-21 17:45:41 +02:00
parent 50cfbde3b8
commit 096075ecfc
2 changed files with 6 additions and 6 deletions

View File

@ -17,12 +17,12 @@
#define CGAL_VERSION_H #define CGAL_VERSION_H
#ifndef SWIG #ifndef SWIG
#define CGAL_VERSION 6.0.1 #define CGAL_VERSION 6.1-dev
#define CGAL_GIT_HASH abcdef #define CGAL_GIT_HASH abcdef
#endif #endif
#define CGAL_VERSION_NR 1060011000 #define CGAL_VERSION_NR 1060100900
#define CGAL_SVN_REVISION 99999 #define CGAL_SVN_REVISION 99999
#define CGAL_RELEASE_DATE 20240925 #define CGAL_RELEASE_DATE 20241130
#include <CGAL/version_macros.h> #include <CGAL/version_macros.h>

View File

@ -1,8 +1,8 @@
set(CGAL_MAJOR_VERSION 6) set(CGAL_MAJOR_VERSION 6)
set(CGAL_MINOR_VERSION 0) set(CGAL_MINOR_VERSION 1)
set(CGAL_BUGFIX_VERSION 1) 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.1") set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.1-dev")
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)