From 2f4a7dda68aeec4c0bc810fa806b5f76f79406a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sat, 25 Jan 2020 09:11:43 +0100 Subject: [PATCH] Have the in-development version report as v3.0.0 Because some of the tooling used by Catch2 does not properly support version postfixes, such as `preview-1`, we will report the in-development version is `v3.0.0`, and the first real release will have to be `v3.0.1`. Closes #1824 --- CMakeLists.txt | 2 +- src/catch2/catch_version.cpp | 2 +- src/catch2/catch_version_macros.hpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93c4e9ea..98785d57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) endif() -project(Catch2 LANGUAGES CXX VERSION 2.10.2) +project(Catch2 LANGUAGES CXX VERSION 3.0.0) # Provide path for scripts list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake") diff --git a/src/catch2/catch_version.cpp b/src/catch2/catch_version.cpp index a617ae14..64db9dbc 100644 --- a/src/catch2/catch_version.cpp +++ b/src/catch2/catch_version.cpp @@ -37,7 +37,7 @@ namespace Catch { } Version const& libraryVersion() { - static Version version( 2, 10, 2, "", 0 ); + static Version version( 3, 0, 0, "preview", 2 ); return version; } diff --git a/src/catch2/catch_version_macros.hpp b/src/catch2/catch_version_macros.hpp index db48b00a..5a9cc050 100644 --- a/src/catch2/catch_version_macros.hpp +++ b/src/catch2/catch_version_macros.hpp @@ -6,8 +6,8 @@ #ifndef TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED #define TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED -#define CATCH_VERSION_MAJOR 2 -#define CATCH_VERSION_MINOR 10 -#define CATCH_VERSION_PATCH 2 +#define CATCH_VERSION_MAJOR 3 +#define CATCH_VERSION_MINOR 0 +#define CATCH_VERSION_PATCH 0 #endif // TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED