dev build 6

catchorg · Oct 31, 2017 · ae21020 · ae21020
1 parent 11f716f
commit ae21020
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 64 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CATCH_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(SELF_TEST_DIR ${CATCH_DIR}/projects/SelfTest)
 set(BENCHMARK_DIR ${CATCH_DIR}/projects/Benchmark)
 set(HEADER_DIR ${CATCH_DIR}/include)
-set(CATCH_VERSION_NUMBER 2.0.0)
+set(CATCH_VERSION_NUMBER 2.0.0-develop.6)
 
 if(USE_CPP14)
     message(STATUS "Enabling C++14")

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 [![Build Status](https://travis-ci.org/philsquared/Catch.svg?branch=catch2)](https://travis-ci.org/philsquared/Catch?branch=catch2)
 [![Build status](https://ci.appveyor.com/api/projects/status/hrtk60hv6tw6fght/branch/catch2?svg=true)](https://ci.appveyor.com/project/philsquared/catch/branch/catch2)
 
-<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>
+<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>
 
 ## What's the Catch?
 

diff --git a/conanfile.py b/conanfile.py
@@ -4,7 +4,7 @@
 
 class CatchConan(ConanFile):
     name = "Catch"
-    version = "2.0.0-develop.5"
+    version = "2.0.0-develop.6"
     description = "A modern, C++-native, header-only, framework for unit-tests, TDD and BDD"
     author = "philsquared"
     generators = "cmake"
@@ -14,6 +14,6 @@ class CatchConan(ConanFile):
 
     def package(self):
         self.copy(pattern="catch.hpp", src="single_include", dst="include")
-    
+
     def package_id(self):
             self.info.header_only()
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -57,6 +57,8 @@
   * The Reporter/Listener interface provides default, empty, implementation to preserve backward compatibility
 * Stringification of `std::chrono::duration` and `std::chrono::time_point` is now supported
   * Needs to be enabled by a per-file compile time configuration option
+* Add `pkg-config` support to CMake install command
+
 
 ## Fixes
 * Don't use console colour if running in XCode
@@ -67,6 +69,8 @@
 * Implemented a workaround for `std::uncaught_exception` issues in libcxxrt
   * These issues caused incorrect section traversals
   * The workaround is only partial, user's test can still trigger the issue by using `throw;` to rethrow an exception
+* Suppressed C4061 warning under MSVC
+
 
 ## Internal changes
 * The development version now uses .cpp files instead of header files containing implementation.

diff --git a/include/internal/catch_version.cpp b/include/internal/catch_version.cpp
@@ -37,7 +37,7 @@ namespace Catch {
     }
 
     Version const& libraryVersion() {
-        static Version version( 2, 0, 0, "develop", 5 );
+        static Version version( 2, 0, 0, "develop", 6 );
         return version;
     }