diff --git a/Documentation/doc/Documentation/Third_party.txt b/Documentation/doc/Documentation/Third_party.txt index e563c92a416..4216f35ad4a 100644 --- a/Documentation/doc/Documentation/Third_party.txt +++ b/Documentation/doc/Documentation/Third_party.txt @@ -14,9 +14,9 @@ supporting C++14 or later. | Linux | \gnu `g++` 8.3 or later\cgalFootnote{`http://gcc.gnu.org/`} | | | `Clang` \cgalFootnote{`http://clang.llvm.org/`} compiler version 11.1.0 | | \ms Windows | \gnu `g++` 8.3 or later\cgalFootnote{`http://gcc.gnu.org/`} | -| | \ms Visual `C++` 14.0, 15.9, 16.10 (\visualstudio 2015, 2017, and 2019)\cgalFootnote{`https://visualstudio.microsoft.com/`} | +| | \ms Visual `C++` 14.0, 15.9, 16.10, 17.0 (\visualstudio 2015, 2017, 2019, and 2022)\cgalFootnote{`https://visualstudio.microsoft.com/`} | | MacOS X | \gnu `g++` 8.3 or later\cgalFootnote{`http://gcc.gnu.org/`} | -| | Apple `Clang` compiler versions 10.0.1 and 12.0.0 | +| | Apple `Clang` compiler versions 10.0.1, 12.0.5, and 13.0.0 | diff --git a/Documentation/doc/resources/1.8.13/menu_version.js b/Documentation/doc/resources/1.8.13/menu_version.js index 45f224cf7d1..23032104d49 100644 --- a/Documentation/doc/resources/1.8.13/menu_version.js +++ b/Documentation/doc/resources/1.8.13/menu_version.js @@ -6,9 +6,10 @@ var current_version_local = '5.3-beta1' var all_versions = [ 'master', - '5.3', + '5.4-beta1', 'latest', - '5.2.3', + '5.3.1', + '5.2.4', '5.1.5', '5.0.4', '4.14.3', diff --git a/Documentation/doc/resources/1.8.14/menu_version.js b/Documentation/doc/resources/1.8.14/menu_version.js index 45f224cf7d1..23032104d49 100644 --- a/Documentation/doc/resources/1.8.14/menu_version.js +++ b/Documentation/doc/resources/1.8.14/menu_version.js @@ -6,9 +6,10 @@ var current_version_local = '5.3-beta1' var all_versions = [ 'master', - '5.3', + '5.4-beta1', 'latest', - '5.2.3', + '5.3.1', + '5.2.4', '5.1.5', '5.0.4', '4.14.3', diff --git a/Documentation/doc/resources/1.8.20/menu_version.js b/Documentation/doc/resources/1.8.20/menu_version.js index 45f224cf7d1..23032104d49 100644 --- a/Documentation/doc/resources/1.8.20/menu_version.js +++ b/Documentation/doc/resources/1.8.20/menu_version.js @@ -6,9 +6,10 @@ var current_version_local = '5.3-beta1' var all_versions = [ 'master', - '5.3', + '5.4-beta1', 'latest', - '5.2.3', + '5.3.1', + '5.2.4', '5.1.5', '5.0.4', '4.14.3', diff --git a/Documentation/doc/resources/1.8.4/menu_version.js b/Documentation/doc/resources/1.8.4/menu_version.js index 45f224cf7d1..23032104d49 100644 --- a/Documentation/doc/resources/1.8.4/menu_version.js +++ b/Documentation/doc/resources/1.8.4/menu_version.js @@ -6,9 +6,10 @@ var current_version_local = '5.3-beta1' var all_versions = [ 'master', - '5.3', + '5.4-beta1', 'latest', - '5.2.3', + '5.3.1', + '5.2.4', '5.1.5', '5.0.4', '4.14.3', diff --git a/Installation/include/CGAL/version.h b/Installation/include/CGAL/version.h index 2909de01a4d..27b4ed766ad 100644 --- a/Installation/include/CGAL/version.h +++ b/Installation/include/CGAL/version.h @@ -17,12 +17,12 @@ #define CGAL_VERSION_H #ifndef SWIG -#define CGAL_VERSION 5.4-dev +#define CGAL_VERSION 5.4-beta1 #define CGAL_GIT_HASH abcdef #endif -#define CGAL_VERSION_NR 1050400900 +#define CGAL_VERSION_NR 1050400910 #define CGAL_SVN_REVISION 99999 -#define CGAL_RELEASE_DATE 20211206 +#define CGAL_RELEASE_DATE 20211215 #include diff --git a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake index 7e67128ec2b..f94c4b1b220 100644 --- a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake +++ b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake @@ -2,7 +2,7 @@ set(CGAL_MAJOR_VERSION 5) set(CGAL_MINOR_VERSION 4) set(CGAL_BUGFIX_VERSION 0) include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake) -set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.4-dev") +set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.4-beta1") set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}") if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0)