Skip to content

Commit ae21020

Browse files
committed
dev build 6
1 parent 11f716f commit ae21020

File tree

7 files changed

+107
-64
lines changed

7 files changed

+107
-64
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(CATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR})
99
set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
1010
set(BENCHMARK_DIR ${CATCH_DIR}/projects/Benchmark)
1111
set(HEADER_DIR ${CATCH_DIR}/include)
12-
set(CATCH_VERSION_NUMBER 2.0.0)
12+
set(CATCH_VERSION_NUMBER 2.0.0-develop.6)
1313

1414
if(USE_CPP14)
1515
message(STATUS "Enabling C++14")

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Build Status](https://travis-ci.org/philsquared/Catch.svg?branch=catch2)](https://travis-ci.org/philsquared/Catch?branch=catch2)
66
[![Build status](https://ci.appveyor.com/api/projects/status/hrtk60hv6tw6fght/branch/catch2?svg=true)](https://ci.appveyor.com/project/philsquared/catch/branch/catch2)
77

8-
<a href="https://github.com/philsquared/Catch/releases/download/v2.0.0-develop.4/catch.hpp">The latest version of the single header can be downloaded directly using this link</a>
8+
<a href="https://github.com/philsquared/Catch/releases/download/v2.0.0-develop.6/catch.hpp">The latest version of the single header can be downloaded directly using this link</a>
99

1010
## What's the Catch?
1111

conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class CatchConan(ConanFile):
66
name = "Catch"
7-
version = "2.0.0-develop.5"
7+
version = "2.0.0-develop.6"
88
description = "A modern, C++-native, header-only, framework for unit-tests, TDD and BDD"
99
author = "philsquared"
1010
generators = "cmake"
@@ -14,6 +14,6 @@ class CatchConan(ConanFile):
1414

1515
def package(self):
1616
self.copy(pattern="catch.hpp", src="single_include", dst="include")
17-
17+
1818
def package_id(self):
1919
self.info.header_only()

docs/release-notes.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
* The Reporter/Listener interface provides default, empty, implementation to preserve backward compatibility
5858
* Stringification of `std::chrono::duration` and `std::chrono::time_point` is now supported
5959
* Needs to be enabled by a per-file compile time configuration option
60+
* Add `pkg-config` support to CMake install command
61+
6062

6163
## Fixes
6264
* Don't use console colour if running in XCode
@@ -67,6 +69,8 @@
6769
* Implemented a workaround for `std::uncaught_exception` issues in libcxxrt
6870
* These issues caused incorrect section traversals
6971
* The workaround is only partial, user's test can still trigger the issue by using `throw;` to rethrow an exception
72+
* Suppressed C4061 warning under MSVC
73+
7074

7175
## Internal changes
7276
* The development version now uses .cpp files instead of header files containing implementation.

include/internal/catch_version.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace Catch {
3737
}
3838

3939
Version const& libraryVersion() {
40-
static Version version( 2, 0, 0, "develop", 5 );
40+
static Version version( 2, 0, 0, "develop", 6 );
4141
return version;
4242
}
4343

0 commit comments

Comments
 (0)