v.10.12.1 release

approvals · Nov 23, 2021 · 36bea02 · 36bea02
1 parent d78a1fd
commit 36bea02
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/ApprovalTests/ApprovalTestsVersion.h b/ApprovalTests/ApprovalTestsVersion.h
@@ -2,8 +2,8 @@
 
 #define APPROVAL_TESTS_VERSION_MAJOR 10
 #define APPROVAL_TESTS_VERSION_MINOR 12
-#define APPROVAL_TESTS_VERSION_PATCH 0
-#define APPROVAL_TESTS_VERSION_STR "10.12.0"
+#define APPROVAL_TESTS_VERSION_PATCH 1
+#define APPROVAL_TESTS_VERSION_STR "10.12.1"
 
 #define APPROVAL_TESTS_VERSION                                                           \
     (APPROVAL_TESTS_VERSION_MAJOR * 10000 + APPROVAL_TESTS_VERSION_MINOR * 100 +         \

diff --git a/README.md b/README.md
@@ -12,8 +12,8 @@
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v1.4%20adopted-ff69b4.svg)](/CODE_OF_CONDUCT.md#top)
 
-:arrow_down: <a href="https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.0/ApprovalTests.v.10.12.0.hpp">
-Download the latest version (v.10.12.0) of the **single header file** here.</a>
+:arrow_down: <a href="https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.1/ApprovalTests.v.10.12.1.hpp">
+Download the latest version (v.10.12.1) of the **single header file** here.</a>
 
 :book: [**Read the Docs**](https://approvaltestscpp.readthedocs.io/en/latest/)
 

diff --git a/build/release_notes/relnotes_10.12.1.md b/build/release_notes/relnotes_10.12.1.md
@@ -0,0 +1,10 @@
+<!-- See the [v.10.12.1 milestone](https://github.com/approvals/ApprovalTests.cpp/milestone/__MILESTONE_NUMBER__?closed=1) for the full list of changes. -->
+
+* **Breaking changes**
+    * None
+* **New features**
+    * None
+* **Bug fixes**
+    * Using kdiff3 as diff tool, users no longer have to specify name of output file after merge (#191 - thanks @bjosv) 
+* **Other changes**
+    * None
diff --git a/build/relnotes_x.y.z.md b/build/relnotes_x.y.z.md
@@ -5,6 +5,6 @@
 * **New features**
     * None
 * **Bug fixes**
-    * Using kdiff3 as diff tool, users no longer have to specify name of output file after merge (#191 - thanks @bjosv) 
+    * None
 * **Other changes**
     * None
diff --git a/build/version.ini b/build/version.ini
@@ -1,5 +1,5 @@
 [VERSION]
 major = 10
 minor = 12
-patch = 0
+patch = 1
 
diff --git a/doc/CMakeIntegration.md b/doc/CMakeIntegration.md
@@ -451,6 +451,14 @@ add_subdirectory(
         ${CMAKE_CURRENT_BINARY_DIR}/doctest_build
 )
 
+# -------------------------------------------------------------------
+# filesystem
+set(CATCH_BUILD_TESTING OFF CACHE BOOL "")
+add_subdirectory(
+        ../filesystem
+        ${CMAKE_CURRENT_BINARY_DIR}/filesystem_build
+)
+
 # -------------------------------------------------------------------
 # fmt
 set(CATCH_BUILD_TESTING OFF CACHE BOOL "")
@@ -480,9 +488,13 @@ add_subdirectory(
         ${CMAKE_CURRENT_BINARY_DIR}/ut_build
 )
 
+if(TARGET Boost::ut)
+    add_library(boost.ut ALIAS ut)
+endif()
+
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     # Turn off some checks off for boost.ut
-    target_compile_options(boost.ut INTERFACE
+    target_compile_options(ut INTERFACE
             -Wno-c99-extensions # Needed for Boost.ut, at least in v1.1.6
             -Wno-documentation-unknown-command # unknown command tag name \userguide
             -Wno-weak-vtables