Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-01-25 09:11:43 +0100
committerMartin Hořeňovský2020-01-25 09:15:46 +0100
commit2f4a7dda68aeec4c0bc810fa806b5f76f79406a8 (patch)
tree69a896eeb82395d96c41a4681c722dfb2d712479
parent6c3a5ef625eda76a2886e15950eca85ed6ebb411 (diff)
downloadcatch3-2f4a7dda68aeec4c0bc810fa806b5f76f79406a8.tar.gz
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
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/catch2/catch_version.cpp2
-rw-r--r--src/catch2/catch_version_macros.hpp6
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