Add missing cstdint includes to avoid compiler errors because of unknown symbols uint32_t and so on

.bazelrc

@@ -1,10 +1,4 @@
-build --enable_platform_specific_config
-
 build:gcc9 --cxxopt=-std=c++2a
-build:gcc11 --cxxopt=-std=c++2a
 build:clang13 --cxxopt=-std=c++17
 build:vs2019 --cxxopt=/std:c++17
-build:vs2022 --cxxopt=/std:c++17
-
-build:windows --config=vs2022
-build:linux --config=gcc11
+build:vs2022 --cxxopt=/std:c++17

.clang-format

@@ -1,45 +1,25 @@
 ---
-Language: Cpp
-Standard: c++14
-
-# Note that we cannot use IncludeIsMainRegex functionality, because it
-# does not support includes in angle brackets (<>)
-SortIncludes: true
-IncludeBlocks: Regroup
-IncludeCategories:
-  - Regex: <catch2/.*\.hpp>
-    Priority: 1
-  - Regex: <.*/.*\.hpp>
-    Priority: 2
-  - Regex: <.*>
-    Priority: 3
-
-AllowShortBlocksOnASingleLine: Always
-AllowShortEnumsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: WithoutElse
-AllowShortLambdasOnASingleLine: Inline
-
-AccessModifierOffset: "-4"
+AccessModifierOffset: '-4'
 AlignEscapedNewlines: Left
-AllowAllConstructorInitializersOnNextLine: "true"
-BinPackArguments: "false"
-BinPackParameters: "false"
+AllowAllConstructorInitializersOnNextLine: 'true'
+BinPackArguments: 'false'
+BinPackParameters: 'false'
 BreakConstructorInitializers: AfterColon
-ConstructorInitializerAllOnOneLineOrOnePerLine: "true"
-DerivePointerAlignment: "false"
-FixNamespaceComments: "true"
-IndentCaseLabels: "false"
+ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
+DerivePointerAlignment: 'false'
+FixNamespaceComments: 'true'
+IncludeBlocks: Regroup
+IndentCaseLabels: 'false'
 IndentPPDirectives: AfterHash
-IndentWidth: "4"
+IndentWidth: '4'
+Language: Cpp
 NamespaceIndentation: All
 PointerAlignment: Left
-SpaceBeforeCtorInitializerColon: "false"
-SpaceInEmptyParentheses: "false"
-SpacesInParentheses: "true"
-TabWidth: "4"
+SpaceBeforeCtorInitializerColon: 'false'
+SpaceInEmptyParentheses: 'false'
+SpacesInParentheses: 'true'
+Standard: Cpp11
+TabWidth: '4'
 UseTab: Never
-AlwaysBreakTemplateDeclarations: Yes
-SpaceAfterTemplateKeyword: true
-SortUsingDeclarations: true
-ReflowComments: true
+
+...

.github/workflows/linux-bazel-builds.yml

@@ -1,24 +0,0 @@
-name: Bazel build
-
-on: [push, pull_request]
-
-jobs:
-  build_and_test_ubuntu:
-    name: Linux Ubuntu 22.04 Bazel build <GCC 11.2.0>
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        compilation_mode: [fastbuild, dbg, opt]
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Mount bazel cache
-      uses: actions/cache@v3
-      with:
-        path: "/home/runner/.cache/bazel"
-        key: bazel-ubuntu22-gcc11
-
-    - name: Build Catch2
-      run: |
-        bazelisk build --compilation_mode=${{matrix.compilation_mode}} //...

.github/workflows/linux-meson-builds.yml

@@ -1,43 +0,0 @@
-name: Linux builds (meson)
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: meson ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        cxx:
-          - g++-11
-          - clang++-11
-        build_type: [debug, release]
-        std: [14, 17]
-        include:
-          - cxx: clang++-11
-            other_pkgs: clang-11
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Prepare environment
-      run: sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}
-
-    - name: Configure build
-      env:
-        CXX: ${{matrix.cxx}}
-        CXXFLAGS: -std=c++${{matrix.std}} ${{matrix.cxxflags}}
-      # Note: $GITHUB_WORKSPACE is distinct from ${{runner.workspace}}.
-      #       This is important
-      run: |
-        meson -Dbuildtype=${{matrix.build_type}} ${{runner.workspace}}/meson-build
-
-    - name: Build tests + lib
-      working-directory: ${{runner.workspace}}/meson-build
-      run: ninja
-
-    - name: Run tests
-      working-directory: ${{runner.workspace}}/meson-build
-      # Hardcode 2 cores we know are there
-      run: |
-        meson test --verbose

.github/workflows/linux-other-builds.yml

@@ -86,7 +86,6 @@ jobs:
         cmake -Bbuild -H$GITHUB_WORKSPACE \
               -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
               -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
               -DCMAKE_CXX_EXTENSIONS=OFF \
               -DCATCH_DEVELOPMENT_BUILD=ON \
               ${{matrix.cmake_configurations}} \

.github/workflows/linux-simple-builds.yml

@@ -9,8 +9,7 @@ jobs:
     strategy:
       matrix:
         cxx:
-          - g++-5
-          - g++-6
+#          - g++-6
           - g++-7
           - g++-8
           - g++-9
@@ -23,10 +22,9 @@ jobs:
         build_type: [Debug, Release]
         std: [14]
         include:
-          - cxx: g++-5
-            other_pkgs: g++-5
-          - cxx: g++-6
-            other_pkgs: g++-6
+        # cannot be installed on ubuntu-20.04 be default?
+#          - cxx: g++-6
+#            other_pkgs: g++-6
           - cxx: g++-7
             other_pkgs: g++-7
           - cxx: g++-8
@@ -65,32 +63,10 @@ jobs:
             build_type: Release
             std: 17
             other_pkgs: clang-10
-          - cxx: clang++-10
-            build_type: Debug
-            std: 20
-            other_pkgs: clang-10
-          - cxx: clang++-10
-            build_type: Release
-            std: 20
-            other_pkgs: clang-10
-          - cxx: g++-10
-            build_type: Debug
-            std: 20
-            other_pkgs: g++-10
-          - cxx: g++-10
-            build_type: Release
-            std: 20
-            other_pkgs: g++-10
 
     steps:
     - uses: actions/checkout@v2
 
-    - name: Add repositories for older GCC
-      run: |
-        sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main'
-        sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic universe'
-      if: ${{ matrix.cxx == 'g++-5' || matrix.cxx == 'g++-6' }}
-
     - name: Prepare environment
       run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
 
@@ -105,7 +81,6 @@ jobs:
         cmake -Bbuild -H$GITHUB_WORKSPACE \
               -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
               -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
               -DCMAKE_CXX_EXTENSIONS=OFF \
               -DCATCH_DEVELOPMENT_BUILD=ON \
               -G Ninja

.github/workflows/mac-builds.yml

@@ -4,15 +4,11 @@ on: [push, pull_request]
 
 jobs:
   build:
-    # macos-12 updated to a toolchain that crashes when linking the
-    # test binary. This seems to be a known bug in that version,
-    # and will eventually get fixed in an update. After that, we can go
-    # back to newer macos images.
-    runs-on: macos-11
+    runs-on: macos-10.15
     strategy:
       matrix:
         cxx:
-          - g++-11
+          - g++-9
           - clang++
         build_type: [Debug, Release]
         std: [14, 17]
@@ -33,11 +29,8 @@ jobs:
       #       This is important
       run: |
         cmake -Bbuild -H$GITHUB_WORKSPACE \
-              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \
-              -DCMAKE_CXX_STANDARD=${{matrix.std}} \
-              -DCMAKE_CXX_STANDARD_REQUIRED=ON \
-              -DCATCH_DEVELOPMENT_BUILD=ON \
-              -DCATCH_BUILD_EXAMPLES=${{matrix.examples}} \
+              -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} \
+              -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_BUILD_EXAMPLES=${{matrix.examples}} \
               -DCATCH_BUILD_EXTRA_TESTS=${{matrix.examples}}
 
     - name: Build tests + lib

.github/workflows/windows-simple-builds.yml

@@ -1,37 +0,0 @@
-name: Windows builds (basic)
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: ${{matrix.os}}, ${{matrix.std}}, ${{matrix.build_type}}, ${{matrix.platform}}
-    runs-on: ${{matrix.os}}
-    strategy:
-      matrix:
-        os: [windows-2019, windows-2022]
-        platform: [Win32, x64]
-        build_type: [Debug, Release]
-        std: [14, 17]
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Configure build
-        working-directory: ${{runner.workspace}}
-        run: |
-          cmake -S $Env:GITHUB_WORKSPACE               `
-                -B ${{runner.workspace}}/build         `
-                -DCMAKE_CXX_STANDARD=${{matrix.std}}   `
-                -A ${{matrix.platform}}                `
-                --preset all-tests
-
-      - name: Build tests
-        working-directory: ${{runner.workspace}}
-        run: cmake --build build --config ${{matrix.build_type}} --parallel %NUMBER_OF_PROCESSORS%
-        shell: cmd
-
-      - name: Run tests
-        working-directory: ${{runner.workspace}}/build
-        env:
-            CTEST_OUTPUT_ON_FAILURE: 1
-        run: ctest -C ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS%
-        shell: cmd

.gitignore

@@ -1,5 +1,4 @@
 *.build
-!meson.build
 *.pbxuser
 *.mode1v3
 *.ncb

BUILD.bazel

@@ -1,13 +1,14 @@
+# Load the cc_library rule.
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
 
 expand_template(
     name = "catch_user_config",
     out = "catch2/catch_user_config.hpp",
     substitutions = {
-        "@CATCH_CONFIG_CONSOLE_WIDTH@": "80",
-        "@CATCH_CONFIG_DEFAULT_REPORTER@": "console",
         "#cmakedefine CATCH_CONFIG_ANDROID_LOGWRITE": "",
         "#cmakedefine CATCH_CONFIG_BAZEL_SUPPORT": "#define CATCH_CONFIG_BAZEL_SUPPORT",
+        "#cmakedefine CATCH_CONFIG_NO_COLOUR_WIN32": "",
         "#cmakedefine CATCH_CONFIG_COLOUR_WIN32": "",
         "#cmakedefine CATCH_CONFIG_COUNTER": "",
         "#cmakedefine CATCH_CONFIG_CPP11_TO_STRING": "",
@@ -28,10 +29,7 @@ expand_template(
         "#cmakedefine CATCH_CONFIG_EXPERIMENTAL_REDIRECT": "",
         "#cmakedefine CATCH_CONFIG_FALLBACK_STRINGIFIER @CATCH_CONFIG_FALLBACK_STRINGIFIER@": "",
         "#cmakedefine CATCH_CONFIG_FAST_COMPILE": "",
-        "#cmakedefine CATCH_CONFIG_GETENV": "",
         "#cmakedefine CATCH_CONFIG_GLOBAL_NEXTAFTER": "",
-        "#cmakedefine CATCH_CONFIG_NO_ANDROID_LOGWRITE": "",
-        "#cmakedefine CATCH_CONFIG_NO_COLOUR_WIN32": "",
         "#cmakedefine CATCH_CONFIG_NO_COUNTER": "",
         "#cmakedefine CATCH_CONFIG_NO_CPP11_TO_STRING": "",
         "#cmakedefine CATCH_CONFIG_NO_CPP17_BYTE": "",
@@ -39,7 +37,6 @@ expand_template(
         "#cmakedefine CATCH_CONFIG_NO_CPP17_STRING_VIEW": "",
         "#cmakedefine CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS": "",
         "#cmakedefine CATCH_CONFIG_NO_CPP17_VARIANT": "",
-        "#cmakedefine CATCH_CONFIG_NO_GETENV": "",
         "#cmakedefine CATCH_CONFIG_NO_GLOBAL_NEXTAFTER": "",
         "#cmakedefine CATCH_CONFIG_NO_POSIX_SIGNALS": "",
         "#cmakedefine CATCH_CONFIG_NO_USE_ASYNC": "",
@@ -48,11 +45,13 @@ expand_template(
         "#cmakedefine CATCH_CONFIG_NOSTDOUT": "",
         "#cmakedefine CATCH_CONFIG_POSIX_SIGNALS": "",
         "#cmakedefine CATCH_CONFIG_PREFIX_ALL": "",
-        "#cmakedefine CATCH_CONFIG_SHARED_LIBRARY": "",
         "#cmakedefine CATCH_CONFIG_USE_ASYNC": "",
         "#cmakedefine CATCH_CONFIG_WCHAR": "",
         "#cmakedefine CATCH_CONFIG_WINDOWS_CRTDBG": "",
         "#cmakedefine CATCH_CONFIG_WINDOWS_SEH": "",
+        "#cmakedefine CATCH_CONFIG_NO_ANDROID_LOGWRITE": "",
+        "@CATCH_CONFIG_DEFAULT_REPORTER@": "console",
+        "@CATCH_CONFIG_CONSOLE_WIDTH@": "80",
     },
     template = "src/catch2/catch_user_config.hpp.in",
 )
@@ -89,4 +88,4 @@ cc_library(
     linkstatic = True,
     visibility = ["//visibility:public"],
     deps = [":catch2"],
-)
+)

CMake/CatchConfigOptions.cmake

@@ -1,7 +1,7 @@
 
 #              Copyright Catch2 Authors
 # Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
+#   (See accompanying file LICENSE_1_0.txt or copy at
 #        https://www.boost.org/LICENSE_1_0.txt)
 
 # SPDX-License-Identifier: BSL-1.0
@@ -40,7 +40,6 @@ set(_OverridableOptions
   "USE_ASYNC"
   "WCHAR"
   "WINDOWS_SEH"
-  "GETENV"
 )
 
 foreach(OptionName ${_OverridableOptions})
@@ -68,7 +67,6 @@ set(_OtherConfigOptions
 foreach(OptionName ${_OtherConfigOptions})
   AddConfigOption(${OptionName})
 endforeach()
-set(CATCH_CONFIG_SHARED_LIBRARY ${BUILD_SHARED_LIBS})
 
 set(CATCH_CONFIG_DEFAULT_REPORTER "console" CACHE STRING "Read docs/configuration.md for details. The name of the reporter should be without quotes.")
 set(CATCH_CONFIG_CONSOLE_WIDTH "80" CACHE STRING "Read docs/configuration.md for details. Must form a valid integer literal.")

CMake/CatchMiscFunctions.cmake

@@ -1,19 +1,18 @@
 
 #              Copyright Catch2 Authors
 # Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
+#   (See accompanying file LICENSE_1_0.txt or copy at
 #        https://www.boost.org/LICENSE_1_0.txt)
 
 # SPDX-License-Identifier: BSL-1.0
 
 include(CheckCXXCompilerFlag)
 function(add_cxx_flag_if_supported_to_targets flagname targets)
-    string(MAKE_C_IDENTIFIER ${flagname} flag_identifier )
-    check_cxx_compiler_flag("${flagname}" HAVE_FLAG_${flag_identifier})
+    check_cxx_compiler_flag("${flagname}" HAVE_FLAG_${flagname})
 
-    if (HAVE_FLAG_${flag_identifier})
+    if (HAVE_FLAG_${flagname})
         foreach(target ${targets})
-            target_compile_options(${target} PRIVATE ${flagname})
+            target_compile_options(${target} PUBLIC ${flagname})
         endforeach()
     endif()
 endfunction()
@@ -113,8 +112,9 @@ endfunction()
 # Adds flags required for reproducible build to the target
 # Currently only supports GCC and Clang
 function(add_build_reproducibility_settings target)
-  # Make the build reproducible on versions of g++ and clang that supports -ffile-prefix-map
-  if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-    add_cxx_flag_if_supported_to_targets("-ffile-prefix-map=${CATCH_DIR}/=" "${target}")
+# Make the build reproducible on versions of g++ and clang that supports -ffile-prefix-map
+  if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 8) OR
+     ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 10))
+    target_compile_options(${target} PRIVATE "-ffile-prefix-map=${CATCH_DIR}=.")
   endif()
 endfunction()

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.5)
 
 # detect if Catch is being bundled,
 # disable testsuite in that case
@@ -30,8 +30,14 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
 endif()
 
+if(CMAKE_VERSION VERSION_GREATER 3.8)
+  # Enable IPO for CMake versions that support it
+  cmake_policy(SET CMP0069 NEW)
+endif()
+
+
 project(Catch2
-  VERSION 3.3.2 # CML version placeholder, don't delete
+  VERSION 3.1.0 # CML version placeholder, don't delete
   LANGUAGES CXX
   # HOMEPAGE_URL is not supported until CMake version 3.12, which
   # we do not target yet.
@@ -148,8 +154,6 @@ if (NOT_SUBPROJECT)
             "extras/ParseAndAddCatchTests.cmake"
             "extras/Catch.cmake"
             "extras/CatchAddTests.cmake"
-            "extras/CatchShardTests.cmake"
-            "extras/CatchShardTestsImpl.cmake"
           DESTINATION
             ${CATCH_CMAKE_CONFIG_DESTINATION}
         )

Doxyfile

@@ -1319,7 +1319,7 @@ CHM_FILE               =
 HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the main .chm file (NO).
+# (YES) or that it should be included in the master .chm file (NO).
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 

README.md

@@ -1,5 +1,5 @@
 <a id="top"></a>
-![Catch2 logo](data/artwork/catch2-logo-small-with-background.png)
+![Catch2 logo](data/artwork/catch2-logo-small.png)
 
 [![Github Releases](https://img.shields.io/github/release/catchorg/catch2.svg)](https://github.com/catchorg/catch2/releases)
 [![Linux build status](https://github.com/catchorg/Catch2/actions/workflows/linux-simple-builds.yml/badge.svg)](https://github.com/catchorg/Catch2/actions/workflows/linux-simple-builds.yml)
@@ -11,82 +11,31 @@
 [![Join the chat in Discord: https://discord.gg/4CWS9zD](https://img.shields.io/badge/Discord-Chat!-brightgreen.svg)](https://discord.gg/4CWS9zD)
 
 
-## What is Catch2?
+## What's the Catch2?
 
 Catch2 is mainly a unit testing framework for C++, but it also
 provides basic micro-benchmarking features, and simple BDD macros.
 
 Catch2's main advantage is that using it is both simple and natural.
-Test names do not have to be valid identifiers, assertions look like
-normal C++ boolean expressions, and sections provide a nice and local way
-to share set-up and tear-down code in tests.
-
-**Example unit test**
-```cpp
-#include <catch2/catch_test_macros.hpp>
-
-#include <cstdint>
-
-uint32_t factorial( uint32_t number ) {
-    return number <= 1 ? number : factorial(number-1) * number;
-}
-
-TEST_CASE( "Factorials are computed", "[factorial]" ) {
-    REQUIRE( factorial( 1) == 1 );
-    REQUIRE( factorial( 2) == 2 );
-    REQUIRE( factorial( 3) == 6 );
-    REQUIRE( factorial(10) == 3'628'800 );
-}
-```
-
-**Example microbenchmark**
-```cpp
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/benchmark/catch_benchmark.hpp>
-
-#include <cstdint>
-
-uint64_t fibonacci(uint64_t number) {
-    return number < 2 ? number : fibonacci(number - 1) + fibonacci(number - 2);
-}
-
-TEST_CASE("Benchmark Fibonacci", "[!benchmark]") {
-    REQUIRE(fibonacci(5) == 5);
-
-    REQUIRE(fibonacci(20) == 6'765);
-    BENCHMARK("fibonacci 20") {
-        return fibonacci(20);
-    };
-
-    REQUIRE(fibonacci(25) == 75'025);
-    BENCHMARK("fibonacci 25") {
-        return fibonacci(25);
-    };
-}
-```
-
-_Note that benchmarks are not run by default, so you need to run it explicitly
-with the `[!benchmark]` tag._
+Tests autoregister themselves and do not have to be named with valid
+identifiers, assertions look like normal C++ code, and sections provide
+a nice way to share set-up and tear-down code in tests.
 
 
-## Catch2 v3 has been released!
+## Catch2 v3 is being developed!
 
-You are on the `devel` branch, where the v3 version is being developed.
-v3 brings a bunch of significant changes, the big one being that Catch2
-is no longer a single-header library. Catch2 now behaves as a normal
-library, with multiple headers and separately compiled implementation.
+You are on the `devel` branch, where the next major version, v3, of
+Catch2 is being developed. As it is a significant rework, you will
+find that parts of this documentation are likely still stuck on v2.
 
-The documentation is slowly being updated to take these changes into
-account, but this work is currently still ongoing.
+For stable (and documentation-matching) version of Catch2, [go to the
+`v2.x` branch](https://github.com/catchorg/Catch2/tree/v2.x).
 
 For migrating from the v2 releases to v3, you should look at [our
 documentation](docs/migrate-v2-to-v3.md#top). It provides a simple
 guidelines on getting started, and collects most common migration
 problems.
 
-For the previous major version of Catch2 [look into the `v2.x` branch
-here on GitHub](https://github.com/catchorg/Catch2/tree/v2.x).
-
 
 ## How to use it
 This documentation comprises these three parts:

WORKSPACE

@@ -0,0 +1,14 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "bazel_skylib",
+    strip_prefix = "bazel-skylib-2a87d4a62af886fb320883aba102255aba87275e",
+    urls = [
+        "https://github.com/bazelbuild/bazel-skylib/archive/2a87d4a62af886fb320883aba102255aba87275e.tar.gz",
+    ],
+    sha256 = "d847b08d6702d2779e9eb399b54ff8920fa7521dc45e3e53572d1d8907767de7",
+)
+
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+
+bazel_skylib_workspace()

WORKSPACE.bazel

@@ -1,16 +0,0 @@
-workspace(name = "catch2")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "bazel_skylib",
-    sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
-    ],
-)
-
-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
-
-bazel_skylib_workspace()

appveyor.yml

@@ -51,6 +51,18 @@ test_script:
 # build explicitly.
 environment:
   matrix:
+    - FLAVOR: VS 2019 x64 Debug Surrogates Configure Tests
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      surrogates: 1
+      configure_tests: 1
+      platform: x64
+      configuration: Debug
+    
+    - FLAVOR: VS 2019 x64 Release
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      platform: x64
+      configuration: Release
+
     - FLAVOR: VS 2019 x64 Debug Coverage Examples
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       examples: 1
@@ -65,6 +77,11 @@ environment:
       platform: x64
       configuration: Debug
 
+    - FLAVOR: VS 2019 Win32 Debug
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      platform: Win32
+      configuration: Debug
+
     - FLAVOR: VS 2019 x64 Debug Latest Strict
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       additional_flags: "/permissive- /std:c++latest"
@@ -75,9 +92,38 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       platform: x64
       configuration: Debug
+    
+    - FLAVOR: VS 2017 x64 Release
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: x64
+      configuration: Release
 
     - FLAVOR: VS 2017 x64 Release Coverage
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       coverage: 1
       platform: x64
-      configuration: Debug
+      configuration: Debug
+
+    - FLAVOR: VS 2017 Win32 Debug
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: Win32
+      configuration: Debug
+
+    - FLAVOR: VS 2017 Win32 Debug Examples
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      examples: 1
+      platform: Win32
+      configuration: Debug
+
+    - FLAVOR: VS 2017 Win32 Debug WMain
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      wmain: 1
+      additional_flags: "/D_UNICODE /DUNICODE"
+      platform: Win32
+      configuration: Debug
+
+    - FLAVOR: VS 2017 x64 Debug Latest Strict
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      additional_flags: "/permissive- /std:c++latest"
+      platform: x64
+      configuration: Debug

docs/Readme.md

@@ -4,36 +4,34 @@
 To get the most out of Catch2, start with the [tutorial](tutorial.md#top).
 Once you're up and running consider the following reference material.
 
-**Writing tests:**
+Writing tests:
 * [Assertion macros](assertions.md#top)
-* [Matchers (asserting complex properties)](matchers.md#top)
-* [Comparing floating point numbers](comparing-floating-point-numbers.md#top)
+* [Matchers](matchers.md#top)
 * [Logging macros](logging.md#top)
 * [Test cases and sections](test-cases-and-sections.md#top)
 * [Test fixtures](test-fixtures.md#top)
-* [Explicitly skipping, passing, and failing tests at runtime](skipping-passing-failing.md#top)
-* [Reporters (output customization)](reporters.md#top)
+* [Reporters](reporters.md#top)
 * [Event Listeners](event-listeners.md#top)
-* [Data Generators (value parameterized tests)](generators.md#top)
+* [Data Generators](generators.md#top)
 * [Other macros](other-macros.md#top)
 * [Micro benchmarking](benchmarks.md#top)
 
-**Fine tuning:**
+Fine tuning:
 * [Supplying your own main()](own-main.md#top)
 * [Compile-time configuration](configuration.md#top)
 * [String Conversions](tostring.md#top)
 
-**Running:**
+Running:
 * [Command line](command-line.md#top)
 
-**Odds and ends:**
+Odds and ends:
 * [Frequently Asked Questions (FAQ)](faq.md#top)
 * [Best practices and other tips](usage-tips.md#top)
 * [CMake integration](cmake-integration.md#top)
-* [Tooling integration (CI, test runners, other)](ci-and-misc.md#top)
+* [CI and other miscellaneous pieces](ci-and-misc.md#top)
 * [Known limitations](limitations.md#top)
-
-**Other:**
+ 
+Other:
 * [Why Catch2?](why-catch.md#top)
 * [Migrating from v2 to v3](migrate-v2-to-v3.md#top)
 * [Open Source Projects using Catch2](opensource-users.md#top)

docs/assertions.md

@@ -3,7 +3,6 @@
 
 **Contents**<br>
 [Natural Expressions](#natural-expressions)<br>
-[Floating point comparisons](#floating-point-comparisons)<br>
 [Exceptions](#exceptions)<br>
 [Matcher expressions](#matcher-expressions)<br>
 [Thread Safety](#thread-safety)<br>
@@ -20,7 +19,7 @@ Most of these macros come in two forms:
 The ```REQUIRE``` family of macros tests an expression and aborts the test case if it fails.
 The ```CHECK``` family are equivalent but execution continues in the same test case even if the assertion fails. This is useful if you have a series of essentially orthogonal assertions and it is useful to see all the results rather than stopping at the first failure.
 
-* **REQUIRE(** _expression_ **)** and
+* **REQUIRE(** _expression_ **)** and  
 * **CHECK(** _expression_ **)**
 
 Evaluates the expression and records the result. If an exception is thrown, it is caught, reported, and counted as a failure. These are the macros you will use most of the time.
@@ -32,78 +31,98 @@ CHECK( thisReturnsTrue() );
 REQUIRE( i == 42 );
 ```
 
-Expressions prefixed with `!` cannot be decomposed. If you have a type
-that is convertible to bool and you want to assert that it evaluates to
-false, use the two forms below:
-
-
-* **REQUIRE_FALSE(** _expression_ **)** and
+* **REQUIRE_FALSE(** _expression_ **)** and  
 * **CHECK_FALSE(** _expression_ **)**
 
-Note that there is no reason to use these forms for plain bool variables,
-because there is no added value in decomposing them.
+Evaluates the expression and records the _logical NOT_ of the result. If an exception is thrown it is caught, reported, and counted as a failure.
+(these forms exist as a workaround for the fact that ! prefixed expressions cannot be decomposed).
 
 Example:
-```cpp
-Status ret = someFunction();
-REQUIRE_FALSE(ret); // ret must evaluate to false, and Catch2 will print
-                    // out the value of ret if possibly
+```
+REQUIRE_FALSE( thisReturnsFalse() );
 ```
 
+Do note that "overly complex" expressions cannot be decomposed and thus will not compile. This is done partly for practical reasons (to keep the underlying expression template machinery to minimum) and partly for philosophical reasons (assertions should be simple and deterministic).
 
-### Other limitations
-
-Note that expressions containing either of the binary logical operators,
-`&&` or `||`, cannot be decomposed and will not compile. The reason behind
-this is that it is impossible to overload `&&` and `||` in a way that
-keeps their short-circuiting semantics, and expression decomposition
-relies on overloaded operators to work.
-
-Simple example of an issue with overloading binary logical operators
-is a common pointer idiom, `p && p->foo == 2`. Using the built-in `&&`
-operator, `p` is only dereferenced if it is not null. With overloaded
-`&&`, `p` is always dereferenced, thus causing a segfault if
-`p == nullptr`.
-
-If you want to test expression that contains `&&` or `||`, you have two
-options.
-
-1) Enclose it in parentheses. Parentheses force evaluation of the expression
-   before the expression decomposition can touch it, and thus it cannot
-   be used.
-
-2) Rewrite the expression. `REQUIRE(a == 1 && b == 2)` can always be split
-   into `REQUIRE(a == 1); REQUIRE(b == 2);`. Alternatively, if this is a
-   common pattern in your tests, think about using [Matchers](#matcher-expressions).
-   instead. There is no simple rewrite rule for `||`, but I generally
-   believe that if you have `||` in your test expression, you should rethink
-   your tests.
+Examples:
+* `CHECK(a == 1 && b == 2);`
+This expression is too complex because of the `&&` operator. If you want to check that 2 or more properties hold, you can either put the expression into parenthesis, which stops decomposition from working, or you need to decompose the expression into two assertions: `CHECK( a == 1 ); CHECK( b == 2);`
+* `CHECK( a == 2 || b == 1 );`
+This expression is too complex because of the `||` operator. If you want to check that one of several properties hold, you can put the expression into parenthesis (unlike with `&&`, expression decomposition into several `CHECK`s is not possible).
 
 
-## Floating point comparisons
+### Floating point comparisons
 
-Comparing floating point numbers is complex, and [so it has its own
-documentation page](comparing-floating-point-numbers.md#top).
+When comparing floating point numbers - especially if at least one of them has been computed - great care must be taken to allow for rounding errors and inexact representations.
+
+Catch provides a way to perform tolerant comparisons of floating point values through use of a wrapper class called `Approx`. `Approx` can be used on either side of a comparison expression. It overloads the comparisons operators to take a tolerance into account. Here's a simple example:
+
+```cpp
+REQUIRE( performComputation() == Approx( 2.1 ) );
+```
+
+Catch also provides a user-defined literal for `Approx`; `_a`. It resides in
+the `Catch::literals` namespace and can be used like so:
+```cpp
+using namespace Catch::literals;
+REQUIRE( performComputation() == 2.1_a );
+```
+
+`Approx` is constructed with defaults that should cover most simple cases.
+For the more complex cases, `Approx` provides 3 customization points:
+
+* __epsilon__ - epsilon serves to set the coefficient by which a result
+can differ from `Approx`'s value before it is rejected.
+_By default set to `std::numeric_limits<float>::epsilon()*100`._
+* __margin__ - margin serves to set the the absolute value by which
+a result can differ from `Approx`'s value before it is rejected.
+_By default set to `0.0`._
+* __scale__ - scale is used to change the magnitude of `Approx` for relative check.
+_By default set to `0.0`._
+
+#### epsilon example
+```cpp
+Approx target = Approx(100).epsilon(0.01);
+100.0 == target; // Obviously true
+200.0 == target; // Obviously still false
+100.5 == target; // True, because we set target to allow up to 1% difference
+```
+
+#### margin example
+```cpp
+Approx target = Approx(100).margin(5);
+100.0 == target; // Obviously true
+200.0 == target; // Obviously still false
+104.0 == target; // True, because we set target to allow absolute difference of at most 5
+```
+
+#### scale
+Scale can be useful if the computation leading to the result worked
+on different scale than is used by the results. Since allowed difference
+between Approx's value and compared value is based primarily on Approx's value
+(the allowed difference is computed as
+`(Approx::scale + Approx::value) * epsilon`), the resulting comparison could
+need rescaling to be correct.
 
 
 ## Exceptions
 
-* **REQUIRE_NOTHROW(** _expression_ **)** and
+* **REQUIRE_NOTHROW(** _expression_ **)** and  
 * **CHECK_NOTHROW(** _expression_ **)**
 
 Expects that no exception is thrown during evaluation of the expression.
 
-* **REQUIRE_THROWS(** _expression_ **)** and
+* **REQUIRE_THROWS(** _expression_ **)** and  
 * **CHECK_THROWS(** _expression_ **)**
 
 Expects that an exception (of any type) is be thrown during evaluation of the expression.
 
-* **REQUIRE_THROWS_AS(** _expression_, _exception type_ **)** and
+* **REQUIRE_THROWS_AS(** _expression_, _exception type_ **)** and  
 * **CHECK_THROWS_AS(** _expression_, _exception type_ **)**
 
 Expects that an exception of the _specified type_ is thrown during evaluation of the expression. Note that the _exception type_ is extended with `const&` and you should not include it yourself.
 
-* **REQUIRE_THROWS_WITH(** _expression_, _string or string matcher_ **)** and
+* **REQUIRE_THROWS_WITH(** _expression_, _string or string matcher_ **)** and  
 * **CHECK_THROWS_WITH(** _expression_, _string or string matcher_ **)**
 
 Expects that an exception is thrown that, when converted to a string, matches the _string_ or _string matcher_ provided (see next section for Matchers).
@@ -139,8 +158,8 @@ REQUIRE_NOTHROW([&](){
 
 To support Matchers a slightly different form is used. Matchers have [their own documentation](matchers.md#top).
 
-* **REQUIRE_THAT(** _lhs_, _matcher expression_ **)** and
-* **CHECK_THAT(** _lhs_, _matcher expression_ **)**
+* **REQUIRE_THAT(** _lhs_, _matcher expression_ **)** and  
+* **CHECK_THAT(** _lhs_, _matcher expression_ **)**  
 
 Matchers can be composed using `&&`, `||` and `!` operators.
 

docs/ci-and-misc.md

@@ -1,15 +1,14 @@
 <a id="top"></a>
-# Tooling integration (CI, test runners and so on)
+# CI and other odd pieces
 
 **Contents**<br>
 [Continuous Integration systems](#continuous-integration-systems)<br>
-[Bazel test runner integration](#bazel-test-runner-integration)<br>
+[Other reporters](#other-reporters)<br>
 [Low-level tools](#low-level-tools)<br>
 [CMake](#cmake)<br>
 
-This page talks about Catch2's integration with other related tooling,
-like Continuous Integration and 3rd party test runners.
-
+This page talks about how Catch integrates with Continuous Integration 
+Build Systems may refer to low-level tools, like CMake, or larger systems that run on servers, like Jenkins or TeamCity. This page will talk about both.
 
 ## Continuous Integration systems
 
@@ -18,9 +17,9 @@ Probably the most important aspect to using Catch with a build server is the use
 Two of these reporters are built in (XML and JUnit) and the third (TeamCity) is included as a separate header. It's possible that the other two may be split out in the future too - as that would make the core of Catch smaller for those that don't need them.
 
 ### XML Reporter
-```-r xml```
+```-r xml``` 
 
-The XML Reporter writes in an XML format that is specific to Catch.
+The XML Reporter writes in an XML format that is specific to Catch. 
 
 The advantage of this format is that it corresponds well to the way Catch works (especially the more unusual features, such as nested sections) and is a fully streaming format - that is it writes output as it goes, without having to store up all its results before it can start writing.
 
@@ -35,6 +34,19 @@ The advantage of this format is that the JUnit Ant schema is widely understood b
 
 The disadvantage is that this schema was designed to correspond to how JUnit works - and there is a significant mismatch with how Catch works. Additionally the format is not streamable (because opening elements hold counts of failed and passing tests as attributes) - so the whole test run must complete before it can be written.
 
+## Other reporters
+Other reporters are not part of the single-header distribution and need
+to be downloaded and included separately. All reporters are stored in
+`single_include` directory in the git repository, and are named
+`catch_reporter_*.hpp`. For example, to use the TeamCity reporter you
+need to download `single_include/catch_reporter_teamcity.hpp` and include
+it after Catch itself.
+
+```cpp
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
+#include "catch_reporter_teamcity.hpp"
+```
 
 ### TeamCity Reporter
 ```-r teamcity```
@@ -57,29 +69,19 @@ Because of the incremental nature of Catch's test suites and ability to run spec
 ```-r sonarqube```
 [SonarQube Generic Test Data](https://docs.sonarqube.org/latest/analysis/generic-test/) XML format for tests metrics.
 
-
-## Bazel test runner integration
-
-Catch2 understands some of the environment variables Bazel uses to control
-test execution. Specifically it understands
-
- * JUnit output path via `XML_OUTPUT_FILE`
- * Test filtering via `TESTBRIDGE_TEST_ONLY`
- * Test sharding via `TEST_SHARD_INDEX`, `TEST_TOTAL_SHARDS`, and `TEST_SHARD_STATUS_FILE`
-
-> Support for `XML_OUTPUT_FILE` was [introduced](https://github.com/catchorg/Catch2/pull/2399) in Catch2 3.0.1
-
-> Support for `TESTBRIDGE_TEST_ONLY` and sharding was introduced in Catch2 3.2.0
-
-This integration is enabled via either a [compile time configuration
-option](configuration.md#bazel-support), or via `BAZEL_TEST` environment
-variable set to "1".
-
-> Support for `BAZEL_TEST` was [introduced](https://github.com/catchorg/Catch2/pull/2459) in Catch2 3.1.0
-
-
 ## Low-level tools
 
+### Precompiled headers (PCHs)
+
+Catch offers prototypal support for being included in precompiled headers, but because of its single-header nature it does need some actions by the user:
+* The precompiled header needs to define `CATCH_CONFIG_ALL_PARTS`
+* The implementation file needs to
+  * undefine `TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED`
+  * define `CATCH_CONFIG_IMPL_ONLY`
+  * define `CATCH_CONFIG_MAIN` or `CATCH_CONFIG_RUNNER`
+  * include "catch.hpp" again
+
+
 ### CodeCoverage module (GCOV, LCOV...)
 
 If you are using GCOV tool to get testing coverage of your code, and are not sure how to integrate it with CMake and Catch, there should be an external example over at https://github.com/fkromer/catch_cmake_coverage

docs/cmake-integration.md

@@ -90,12 +90,12 @@ cmake_minimum_required(VERSION 3.5)
 project(baz LANGUAGES CXX VERSION 0.0.1)
 
 find_package(Catch2 REQUIRED)
-add_executable(tests test.cpp)
-target_link_libraries(tests PRIVATE Catch2::Catch2)
+add_executable(foo test.cpp)
+target_link_libraries(foo PRIVATE Catch2::Catch2)
 
 include(CTest)
 include(Catch)
-catch_discover_tests(tests)
+catch_discover_tests(foo)
 ```
 
 When using `FetchContent`, `include(Catch)` will fail unless
@@ -108,11 +108,11 @@ directory.
 list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
 include(CTest)
 include(Catch)
-catch_discover_tests(tests)
+catch_discover_tests()
 ```
 
 #### Customization
-`catch_discover_tests` can be given several extra arguments:
+`catch_discover_tests` can be given several extra argumets:
 ```cmake
 catch_discover_tests(target
                      [TEST_SPEC arg1...]
@@ -222,12 +222,12 @@ cmake_minimum_required(VERSION 3.5)
 project(baz LANGUAGES CXX VERSION 0.0.1)
 
 find_package(Catch2 REQUIRED)
-add_executable(tests test.cpp)
-target_link_libraries(tests PRIVATE Catch2::Catch2)
+add_executable(foo test.cpp)
+target_link_libraries(foo PRIVATE Catch2::Catch2)
 
 include(CTest)
 include(ParseAndAddCatchTests)
-ParseAndAddCatchTests(tests)
+ParseAndAddCatchTests(foo)
 ```
 
 

docs/command-line.md

@@ -148,7 +148,7 @@ validity, and throw an error if they are wrong._
 > Support for passing arguments to reporters through the `-r`, `--reporter` flag was introduced in Catch2 3.0.1
 
 There are multiple built-in reporters, you can see what they do by using the
-[`--list-reporters`](command-line.md#listing-available-tests-tags-or-reporters)
+[`--list-reporter`](command-line.md#listing-available-tests-tags-or-reporters)
 flag. If you need a reporter providing custom format outside of the already
 provided ones, look at the ["write your own reporter" part of the reporter
 documentation](reporters.md#writing-your-own-reporter).
@@ -284,7 +284,7 @@ This option transforms tabs and newline characters into ```\t``` and ```\n``` re
 <pre>-w, --warn &lt;warning name></pre>
 
 You can think of Catch2's warnings as the equivalent of `-Werror` (`/WX`)
-flag for C++ compilers. It turns some suspicious occurrences, like a section
+flag for C++ compilers. It turns some suspicious occurences, like a section
 without assertions, into errors. Because these might be intended, warnings
 are not enabled by default, but user can opt in.
 
@@ -313,7 +313,7 @@ When set to ```yes``` Catch will report the duration of each test case, in milli
 > `--min-duration` was [introduced](https://github.com/catchorg/Catch2/pull/1910) in Catch2 2.13.0
 
 When set, Catch will report the duration of each test case that took more
-than &lt;value> seconds, in milliseconds. This option is overridden by both
+than &lt;value> seconds, in milliseconds. This option is overriden by both
 `-d yes` and `-d no`, so that either all durations are reported, or none
 are.
 
@@ -339,8 +339,8 @@ Test cases are ordered one of three ways:
 
 ### decl
 Declaration order (this is the default order if no --order argument is provided).
-Tests in the same translation unit are sorted using their declaration orders,
-different TUs are sorted in an implementation (linking) dependent order.
+Tests in the same TU are sorted using their declaration orders, different
+TUs are in an implementation (linking) dependent order.
 
 
 ### lex
@@ -507,13 +507,10 @@ start of the first section.</br>
 ## Filenames as tags
 <pre>-#, --filenames-as-tags</pre>
 
-This option adds an extra tag to all test cases. The tag is `#` followed
-by the unqualified filename the test case is defined in, with the _last_
-extension stripped out.
-
-For example, tests within the file `tests\SelfTest\UsageTests\BDD.tests.cpp`
-will be given the `[#BDD.tests]` tag.
+When this option is used then every test is given an additional tag which is formed of the unqualified
+filename it is found in, with any extension stripped, prefixed with the `#` character.
 
+So, for example,  tests within the file `~\Dev\MyProject\Ferrets.cpp` would be tagged `[#Ferrets]`.
 
 <a id="colour-mode"></a>
 ## Override output colouring
@@ -551,8 +548,7 @@ starting at 0. The tests in the set given by
 `--shard-index <#shard index to run>` will be executed. The default shard
 count is `1`, and the default index to run is `0`.
 
-_Shard index must be less than number of shards. As the name suggests,
-it is treated as an index of the shard to run._
+_It is an error to specify a shard index greater than the number of shards._
 
 Sharding is useful when you want to split test execution across multiple
 processes, as is done with the [Bazel test sharding](https://docs.bazel.build/versions/main/test-encyclopedia.html#test-sharding).
@@ -564,17 +560,17 @@ processes, as is done with the [Bazel test sharding](https://docs.bazel.build/ve
 
 > Introduced in Catch2 3.0.1.
 
-By default, Catch2 test binaries return non-0 exit code if no tests were run,
-e.g. if the binary was compiled with no tests, the provided test spec matched no
-tests, or all tests [were skipped at runtime](skipping-passing-failing.md#top). This flag
-overrides that, so a test run with no tests still returns 0.
+By default, Catch2 test binaries return non-0 exit code if no tests were
+run, e.g. if the binary was compiled with no tests, or the provided test
+spec matched no tests. This flag overrides that, so a test run with no
+tests still returns 0.
 
 ## Output verbosity
 ```
 -v, --verbosity <quiet|normal|high>
 ```
 
-Changing verbosity might change how many details Catch2's reporters output.
+Changing verbosity might change how much details Catch2's reporters output.
 However, you should consider changing the verbosity level as a _suggestion_.
 Not all reporters support all verbosity levels, e.g. because the reporter's
 format cannot meaningfully change. In that case, the verbosity level is

docs/commercial-users.md

@@ -6,7 +6,7 @@ some of them that are willing to share this information.
 
 If you want to add your organisation, please check that there is no issue
 with you sharing this fact.
-
+ 
  - Bloomberg
  - [Bloomlife](https://bloomlife.com)
  - [Inscopix Inc.](https://www.inscopix.com/)
@@ -16,7 +16,7 @@ with you sharing this fact.
  - [Nexus Software Systems](https://nexwebsites.com)
  - [UX3D](https://ux3d.io)
  - [King](https://king.com)
-
+ 
 
 ---
 

docs/comparing-floating-point-numbers.md

@@ -1,192 +0,0 @@
-<a id="top"></a>
-# Comparing floating point numbers with Catch2
-
-If you are not deeply familiar with them, floating point numbers can be
-unintuitive. This also applies to comparing floating point numbers for
-(in)equality.
-
-This page assumes that you have some understanding of both FP, and the
-meaning of different kinds of comparisons, and only goes over what
-functionality Catch2 provides to help you with comparing floating point
-numbers. If you do not have this understanding, we recommend that you first
-study up on floating point numbers and their comparisons, e.g. by [reading
-this blog post](https://codingnest.com/the-little-things-comparing-floating-point-numbers/).
-
-
-## Floating point matchers
-
-```
-#include <catch2/matchers/catch_matchers_floating_point.hpp>
-```
-
-[Matchers](matchers.md#top) are the preferred way of comparing floating
-point numbers in Catch2. We provide 3 of them:
-
-* `WithinAbs(double target, double margin)`,
-* `WithinRel(FloatingPoint target, FloatingPoint eps)`, and
-* `WithinULP(FloatingPoint target, uint64_t maxUlpDiff)`.
-
-> `WithinRel` matcher was introduced in Catch2 2.10.0
-
-As with all matchers, you can combine multiple floating point matchers
-in a single assertion. For example, to check that some computation matches
-a known good value within 0.1% or is close enough (no different to 5
-decimal places) to zero, we would write this assertion:
-
-```cpp
-    REQUIRE_THAT( computation(input),
-        Catch::Matchers::WithinRel(expected, 0.001)
-     || Catch::Matchers::WithinAbs(0, 0.000001) );
-```
-
-
-### WithinAbs
-
-`WithinAbs` creates a matcher that accepts floating point numbers whose
-difference with `target` is less-or-equal to the `margin`. Since `float`
-can be converted to `double` without losing precision, only `double`
-overload exists.
-
-```cpp
-REQUIRE_THAT(1.0, WithinAbs(1.2, 0.2));
-REQUIRE_THAT(0.f, !WithinAbs(1.0, 0.5));
-// Notice that infinity == infinity for WithinAbs
-REQUIRE_THAT(INFINITY, WithinAbs(INFINITY, 0));
-```
-
-
-### WithinRel
-
-`WithinRel` creates a matcher that accepts floating point numbers that
-are _approximately equal_ to the `target` with a tolerance of `eps.`
-Specifically, it matches if
-`|arg - target| <= eps * max(|arg|, |target|)` holds. If you do not
-specify `eps`, `std::numeric_limits<FloatingPoint>::epsilon * 100`
-is used as the default.
-
-```cpp
-// Notice that WithinRel comparison is symmetric, unlike Approx's.
-REQUIRE_THAT(1.0, WithinRel(1.1, 0.1));
-REQUIRE_THAT(1.1, WithinRel(1.0, 0.1));
-// Notice that inifnity == infinity for WithinRel
-REQUIRE_THAT(INFINITY, WithinRel(INFINITY));
-```
-
-
-### WithinULP
-
-`WithinULP` creates a matcher that accepts floating point numbers that
-are no more than `maxUlpDiff`
-[ULPs](https://en.wikipedia.org/wiki/Unit_in_the_last_place)
-away from the `target` value. The short version of what this means
-is that there is no more than `maxUlpDiff - 1` representable floating
-point numbers between the argument for matching and the `target` value.
-
-When using the ULP matcher in Catch2, it is important to keep in mind
-that Catch2 interprets ULP distance slightly differently than
-e.g. `std::nextafter` does.
-
-Catch2's ULP calculation obeys these relations:
-  * `ulpDistance(-x, x) == 2 * ulpDistance(x, 0)`
-  * `ulpDistance(-0, 0) == 0` (due to the above)
-  * `ulpDistance(DBL_MAX, INFINITY) == 1`
-  * `ulpDistancE(NaN, x) == infinity`
-
-
-**Important**: The WithinULP matcher requires the platform to use the
-[IEEE-754](https://en.wikipedia.org/wiki/IEEE_754) representation for
-floating point numbers.
-
-```cpp
-REQUIRE_THAT( -0.f, WithinULP( 0.f, 0 ) );
-```
-
-
-## `Approx`
-
-```
-#include <catch2/catch_approx.hpp>
-```
-
-**We strongly recommend against using `Approx` when writing new code.**
-You should be using floating point matchers instead.
-
-Catch2 provides one more way to handle floating point comparisons. It is
-`Approx`, a special type with overloaded comparison operators, that can
-be used in standard assertions, e.g.
-
-```cpp
-REQUIRE(0.99999 == Catch::Approx(1));
-```
-
-`Approx` supports four comparison operators, `==`, `!=`, `<=`, `>=`, and can
-also be used with strong typedefs over `double`s. It can be used for both
-relative and margin comparisons by using its three customization points.
-Note that the semantics of this is always that of an _or_, so if either
-the relative or absolute margin comparison passes, then the whole comparison
-passes.
-
-The downside to `Approx` is that it has a couple of issues that we cannot
-fix without breaking backwards compatibility. Because Catch2 also provides
-complete set of matchers that implement different floating point comparison
-methods, `Approx` is left as-is, is considered deprecated, and should
-not be used in new code.
-
-The issues are
-  * All internal computation is done in `double`s, leading to slightly
-    different results if the inputs were floats.
-  * `Approx`'s relative margin comparison is not symmetric. This means
-    that `Approx( 10 ).epsilon(0.1) != 11.1` but `Approx( 11.1 ).epsilon(0.1) == 10`.
-  * By default, `Approx` only uses relative margin comparison. This means
-    that `Approx(0) == X` only passes for `X == 0`.
-
-
-### Approx details
-
-If you still want/need to know more about `Approx`, read on.
-
-Catch2 provides a UDL for `Approx`; `_a`. It resides in the `Catch::literals`
-namespace, and can be used like this:
-
-```cpp
-using namespace Catch::literals;
-REQUIRE( performComputation() == 2.1_a );
-```
-
-`Approx` has three customization points for the comparison:
-
-* **epsilon** - epsilon sets the coefficient by which a result
-can differ from `Approx`'s value before it is rejected.
-_Defaults to `std::numeric_limits<float>::epsilon()*100`._
-
-```cpp
-Approx target = Approx(100).epsilon(0.01);
-100.0 == target; // Obviously true
-200.0 == target; // Obviously still false
-100.5 == target; // True, because we set target to allow up to 1% difference
-```
-
-
-* **margin** - margin sets the absolute value by which
-a result can differ from `Approx`'s value before it is rejected.
-_Defaults to `0.0`._
-
-```cpp
-Approx target = Approx(100).margin(5);
-100.0 == target; // Obviously true
-200.0 == target; // Obviously still false
-104.0 == target; // True, because we set target to allow absolute difference of at most 5
-```
-
-* **scale** - scale is used to change the magnitude of `Approx` for the relative check.
-_By default, set to `0.0`._
-
-Scale could be useful if the computation leading to the result worked
-on a different scale than is used by the results. Approx's scale is added
-to Approx's value when computing the allowed relative margin from the
-Approx's value.
-
-
----
-
-[Home](Readme.md#top)

docs/configuration.md

@@ -19,7 +19,7 @@
 Catch2 is designed to "just work" as much as possible, and most of the
 configuration options below are changed automatically during compilation,
 according to the detected environment. However, this detection can also
-be overridden by users, using macros documented below, and/or CMake options
+be overriden by users, using macros documented below, and/or CMake options
 with the same name.
 
 
@@ -98,19 +98,13 @@ is equivalent with the out-of-the-box experience.
 
 
 ## Bazel support
-
-Compiling Catch2 with `CATCH_CONFIG_BAZEL_SUPPORT` force-enables Catch2's
-support for Bazel's environment variables (normally Catch2 looks for
-`BAZEL_TEST=1` env var first).
-
-This can be useful if you are using older versions of Bazel, that do not
-yet have `BAZEL_TEST` env var support.
+When `CATCH_CONFIG_BAZEL_SUPPORT` is defined or when `BAZEL_TEST=1` (which is set by the Bazel inside of a test environment), 
+Catch2 will register a `JUnit` reporter writing to a path pointed by `XML_OUTPUT_FILE` provided by Bazel.
 
 > `CATCH_CONFIG_BAZEL_SUPPORT` was [introduced](https://github.com/catchorg/Catch2/pull/2399) in Catch2 3.0.1.
 
 > `CATCH_CONFIG_BAZEL_SUPPORT` was [deprecated](https://github.com/catchorg/Catch2/pull/2459) in Catch2 3.1.0.
 
-
 ## C++11 toggles
 
     CATCH_CONFIG_CPP11_TO_STRING // Use `std::to_string`
@@ -155,20 +149,13 @@ by using `_NO_` in the macro, e.g. `CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS`.
     CATCH_CONFIG_USE_ASYNC                  // Force parallel statistical processing of samples during benchmarking
     CATCH_CONFIG_ANDROID_LOGWRITE           // Use android's logging system for debug output
     CATCH_CONFIG_GLOBAL_NEXTAFTER           // Use nextafter{,f,l} instead of std::nextafter
-    CATCH_CONFIG_GETENV                     // System has a working `getenv`
 
 > [`CATCH_CONFIG_ANDROID_LOGWRITE`](https://github.com/catchorg/Catch2/issues/1743) and [`CATCH_CONFIG_GLOBAL_NEXTAFTER`](https://github.com/catchorg/Catch2/pull/1739) were introduced in Catch2 2.10.0
 
-> `CATCH_CONFIG_GETENV` was [introduced](https://github.com/catchorg/Catch2/pull/2562) in Catch2 3.2.0
-
 Currently Catch enables `CATCH_CONFIG_WINDOWS_SEH` only when compiled with MSVC, because some versions of MinGW do not have the necessary Win32 API support.
 
 `CATCH_CONFIG_POSIX_SIGNALS` is on by default, except when Catch is compiled under `Cygwin`, where it is disabled by default (but can be force-enabled by defining `CATCH_CONFIG_POSIX_SIGNALS`).
 
-`CATCH_CONFIG_GETENV` is on by default, except when Catch2 is compiled for
-platforms that lacks working `std::getenv` (currently Windows UWP and
-Playstation).
-
 `CATCH_CONFIG_WINDOWS_CRTDBG` is off by default. If enabled, Windows's
 CRT is used to check for memory leaks, and displays them after the tests
 finish running. This option only works when linking against the default

docs/contributing.md

@@ -55,15 +55,6 @@ tests from `SelfTest` through a specific reporter and then compare the
 generated output with a known good output ("Baseline"). By default, new
 tests should be placed here.
 
-To configure a Catch2 build with just the basic tests, use the `basic-tests`
-preset, like so:
-
-```
-# Assuming you are in Catch2's root folder
-
-cmake -B basic-test-build -S . -DCMAKE_BUILD_TYPE=Debug --preset basic-tests
-```
-
 However, not all tests can be written as plain unit tests. For example,
 checking that Catch2 orders tests randomly when asked to, and that this
 random ordering is subset-invariant, is better done as an integration
@@ -85,23 +76,21 @@ configuration and require separate compilation.
 Finally, CMake config tests test that you set Catch2's compile-time
 configuration options through CMake, using CMake options of the same name.
 
-These test categories can be enabled one by one, by passing
+None of these tests are enabled by default. To enable them, add
 `-DCATCH_BUILD_EXAMPLES=ON`, `-DCATCH_BUILD_EXTRA_TESTS=ON`, and
-`-DCATCH_ENABLE_CONFIGURE_TESTS=ON` when configuring the build.
+`-DCATCH_ENABLE_CONFIGURE_TESTS=ON` when configuration the CMake build.
 
-Catch2 also provides a preset that promises to enable _all_ test types,
-`all-tests`.
-
-The snippet below will build & run all tests, in `Debug` compilation mode.
+Bringing this all together, the steps below should configure, build,
+and run all tests in the `Debug` compilation.
 
 <!-- snippet: catch2-build-and-test -->
 <a id='snippet-catch2-build-and-test'></a>
 ```sh
-# 1. Regenerate the amalgamated distribution (some tests are built against it)
+# 1. Regenerate the amalgamated distribution
 ./tools/scripts/generateAmalgamatedFiles.py
 
 # 2. Configure the full test build
-cmake -B debug-build -S . -DCMAKE_BUILD_TYPE=Debug --preset all-tests
+cmake -Bdebug-build -H. -DCMAKE_BUILD_TYPE=Debug -DCATCH_DEVELOPMENT_BUILD=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_BUILD_EXTRA_TESTS=ON
 
 # 3. Run the actual build
 cmake --build debug-build
@@ -136,7 +125,7 @@ information that you will need for updating Catch2's documentation, and
 possibly some generic advise as well.
 
 
-### Technicalities
+### Technicalities 
 
 First, the technicalities:
 
@@ -214,7 +203,7 @@ and so on.
 
 Catch2 currently targets C++14 as the minimum supported C++ version.
 Features from higher language versions should be used only sparingly,
-when the benefits from using them outweigh the maintenance overhead.
+when the benefits from using them outweight the maintenance overhead.
 
 Example of good use of polyfilling features is our use of `conjunction`,
 where if available we use `std::conjunction` and otherwise provide our
@@ -302,7 +291,7 @@ Specifically, every source file should start with the licence header:
 
     //              Copyright Catch2 Authors
     // Distributed under the Boost Software License, Version 1.0.
-    //   (See accompanying file LICENSE.txt or copy at
+    //   (See accompanying file LICENSE_1_0.txt or copy at
     //        https://www.boost.org/LICENSE_1_0.txt)
 
     // SPDX-License-Identifier: BSL-1.0
@@ -314,20 +303,6 @@ be `CATCH_MATCHERS_FOO_HPP_INCLUDED`, for `catch_generators_bar.hpp`, the includ
 guard should be `CATCH_GENERATORS_BAR_HPP_INCLUDED`, and so on.
 
 
-### Adding new `CATCH_CONFIG` option
-
-When adding new `CATCH_CONFIG` option, there are multiple places to edit:
-  * `CMake/CatchConfigOptions.cmake` - this is used to generate the
-    configuration options in CMake, so that CMake frontends know about them.
-  * `docs/configuration.md` - this is where the options are documented
-  * `src/catch2/catch_user_config.hpp.in` - this is template for generating
-    `catch_user_config.hpp` which contains the materialized configuration
-  * `BUILD.bazel` - Bazel does not have configuration support like CMake,
-    and all expansions need to be done manually
-  * other files as needed, e.g. `catch2/internal/catch_config_foo.hpp`
-    for the logic that guards the configuration
-
-
 ## CoC
 
 This project has a [CoC](../CODE_OF_CONDUCT.md). Please adhere to it

docs/deprecations.md

@@ -26,15 +26,6 @@ to accurately probe the environment for this information so the flag
 where it will export `BAZEL_TEST=1` for purposes like the above. Catch2
 will now instead inspect the environment instead of relying on build configuration.
 
-### `IEventLister::skipTest( TestCaseInfo const& testInfo )`
-
-This event (including implementations in derived classes such as `ReporterBase`)
-is deprecated and will be removed in the next major release. It is currently
-invoked for all test cases that are not going to be executed due to the test run
-being aborted (when using `--abort` or `--abortx`). It is however
-**NOT** invoked for test cases that are [explicitly skipped using the `SKIP`
-macro](skipping-passing-failing.md#top).
-
 ---
 
 [Home](Readme.md#top)

docs/event-listeners.md

@@ -33,7 +33,7 @@ public:
 CATCH_REGISTER_LISTENER(testRunListener)
 ```
 
-_Note that you should not use any assertion macros within a Listener!_
+_Note that you should not use any assertion macros within a Listener!_ 
 
 [You can find the list of events that the listeners can react to on its
 own page](reporter-events.md#top).

docs/faq.md

@@ -7,10 +7,6 @@
 [Why cannot I derive from the built-in reporters?](#why-cannot-i-derive-from-the-built-in-reporters)<br>
 [What is Catch2's ABI stability policy?](#what-is-catch2s-abi-stability-policy)<br>
 [What is Catch2's API stability policy?](#what-is-catch2s-api-stability-policy)<br>
-[Does Catch2 support running tests in parallel?](#does-catch2-support-running-tests-in-parallel)<br>
-[Can I compile Catch2 into a dynamic library?](#can-i-compile-catch2-into-a-dynamic-library)<br>
-[What repeatability guarantees does Catch2 provide?](#what-repeatability-guarantees-does-catch2-provide)<br>
-
 
 ## How do I run global setup/teardown only if tests will be run?
 
@@ -27,7 +23,7 @@ depending on how often the cleanup needs to happen.
 
 ## Why cannot I derive from the built-in reporters?
 
-They are not made to be overridden, in that we do not attempt to maintain
+They are not made to be overriden, in that we do not attempt to maintain
 a consistent internal state if a member function is overriden, and by
 forbidding users from using them as a base class, we can refactor them
 as needed later.
@@ -61,34 +57,6 @@ runners easier. [See the relevant section in our page on best
 practices](usage-tips.md#parallel-tests).
 
 
-## Can I compile Catch2 into a dynamic library?
-
-Yes, Catch2 supports the [standard CMake `BUILD_SHARED_LIBS`
-option](https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html).
-However, the dynamic library support is provided as-is. Catch2 does not
-provide API export annotations, and so you can only use it as a dynamic
-library on platforms that default to public visibility, or with tooling
-support to force export Catch2's API.
-
-
-## What repeatability guarantees does Catch2 provide?
-
-There are two places where it is meaningful to talk about Catch2's
-repeatability guarantees without taking into account user-provided
-code. First one is in the test case shuffling, and the second one is
-the output from random generators.
-
-Test case shuffling is repeatable across different platforms since v2.12.0,
-and it is also generally repeatable across versions, but we might break
-it from time to time. E.g. we broke repeatability with previous versions
-in v2.13.4 so that test cases with similar names are shuffled better.
-
-Random generators currently rely on platform's stdlib, specifically
-the distributions from `<random>`. We thus provide no extra guarantee
-above what your platform does. **Important: `<random>`'s distributions
-are not specified to be repeatable across different platforms.**
-
-
 ---
 
 [Home](Readme.md#top)

docs/generators.md

@@ -205,17 +205,13 @@ struct IGenerator : GeneratorUntypedBase {
     // Precondition:
     // The generator is either freshly constructed or the last call to next() returned true
     virtual T const& get() const = 0;
-
-    // Returns user-friendly string showing the current generator element
-    // Does not have to be overridden, IGenerator provides default implementation
-    virtual std::string stringifyImpl() const;
 };
 ```
 
 However, to be able to use your custom generator inside `GENERATE`, it
 will need to be wrapped inside a `GeneratorWrapper<T>`.
 `GeneratorWrapper<T>` is a value wrapper around a
-`Catch::Detail::unique_ptr<IGenerator<T>>`.
+`std::unique_ptr<IGenerator<T>>`.
 
 For full example of implementing your own generator, look into Catch2's
 examples, specifically

docs/limitations.md

@@ -88,8 +88,8 @@ because only one thread passes the `REQUIRE` macro and this is not
     REQUIRE(cnt == 16);
 ```
 
-We currently do not plan to support thread-safe assertions.
-
+Because C++11 provides the necessary tools to do this, we are planning
+to remove this limitation in the future.
 
 ### Process isolation in a test
 Catch does not support running tests in isolated (forked) processes. While this might in the future, the fact that Windows does not support forking and only allows full-on process creation and the desire to keep code as similar as possible across platforms, mean that this is likely to take significant development time, that is not currently available.
@@ -99,7 +99,7 @@ Catch does not support running tests in isolated (forked) processes. While this
 
 Catch2 keeps test execution in one process strictly serial, and there
 are no plans to change this. If you find yourself with a test suite
-that takes too long to run and you want to make it parallel, you have
+that takes too long to run and yo uwant to make it parallel, you have
 to run multiple processes side by side.
 
 There are 2 basic ways to do that,
@@ -155,7 +155,7 @@ with expansion:
 
 
 ### Clang/G++ -- skipping leaf sections after an exception
-Some versions of `libc++` and `libstdc++` (or their runtimes) have a bug with `std::uncaught_exception()` getting stuck returning `true` after rethrow, even if there are no active exceptions. One such case is this snippet, which skipped the sections "a" and "b", when compiled against `libcxxrt` from the master branch
+Some versions of `libc++` and `libstdc++` (or their runtimes) have a bug with `std::uncaught_exception()` getting stuck returning `true` after rethrow, even if there are no active exceptions. One such case is this snippet, which skipped the sections "a" and "b", when compiled against `libcxxrt` from master
 ```cpp
 #include <catch2/catch_test_macros.hpp>
 
@@ -171,7 +171,7 @@ TEST_CASE("b") {
 }
 ```
 
-If you are seeing a problem like this, i.e. weird test paths that trigger only under Clang with `libc++`, or only under very specific version of `libstdc++`, it is very likely you are seeing this. The only known workaround is to use a fixed version of your standard library.
+If you are seeing a problem like this, i.e. a weird test paths that trigger only under Clang with `libc++`, or only under very specific version of `libstdc++`, it is very likely you are seeing this. The only known workaround is to use a fixed version of your standard library.
 
 
 ### libstdc++, `_GLIBCXX_DEBUG` macro and random ordering of tests

docs/matchers.md

@@ -141,26 +141,58 @@ are a permutation of the ones in `some_vec`.
 
 ### Floating point matchers
 
-Catch2 provides 4 matchers that target floating point numbers. These
+Catch2 provides 3 matchers that target floating point numbers. These
 are:
 
 * `WithinAbs(double target, double margin)`,
 * `WithinULP(FloatingPoint target, uint64_t maxUlpDiff)`, and
 * `WithinRel(FloatingPoint target, FloatingPoint eps)`.
-* `IsNaN()`
 
 > `WithinRel` matcher was introduced in Catch2 2.10.0
 
-> `IsNaN` matcher was introduced in Catch2 3.3.2.
 
-The first three serve to compare two floating pointe numbers. For more
-details about how they work, read [the docs on comparing floating point
-numbers](comparing-floating-point-numbers.md#floating-point-matchers).
+`WithinAbs` creates a matcher that accepts floating point numbers whose
+difference with `target` is less than the `margin`.
 
-`IsNaN` then does exactly what it says on the tin. It matches the input
-if it is a NaN (Not a Number). The advantage of using it over just plain
-`REQUIRE(std::isnan(x))`, is that if the check fails, with `REQUIRE` you
-won't see the value of `x`, but with `REQUIRE_THAT(x, IsNaN())`, you will.
+`WithinULP` creates a matcher that accepts floating point numbers that
+are no more than `maxUlpDiff`
+[ULPs](https://en.wikipedia.org/wiki/Unit_in_the_last_place)
+away from the `target` value. The short version of what this means
+is that there is no more than `maxUlpDiff - 1` representeable floating
+point numbers between the argument for matching and the `target` value.
+
+**Important**: The WithinULP matcher requires the platform to use the
+[IEEE-754](https://en.wikipedia.org/wiki/IEEE_754) representation for
+floating point numbers.
+
+
+`WithinRel` creates a matcher that accepts floating point numbers that
+are _approximately equal_ with the `target` with tolerance of `eps.`
+Specifically, it matches if
+`|arg - target| <= eps * max(|arg|, |target|)` holds. If you do not
+specify `eps`, `std::numeric_limits<FloatingPoint>::epsilon * 100`
+is used as the default.
+
+
+In practice, you will often want to combine multiple of these matchers,
+together for an assertion, because all 3 options have edge cases where
+they behave differently than you would expect. As an example, under
+the `WithinRel` matcher, a `0.` only ever matches a `0.` (or `-0.`),
+regardless of the relative tolerance specified. Thus, if you want to
+handle numbers that are "close enough to 0 to be 0", you have to combine
+it with the `WithinAbs` matcher.
+
+For example, to check that our computation matches known good value
+within 0.1%, or is close enough (no different to 5 decimal places)
+to zero, we would write this assertion:
+```cpp
+    REQUIRE_THAT( computation(input),
+        Catch::Matchers::WithinRel(expected, 0.001)
+     || Catch::Matchers::WithinAbs(0, 0.000001) );
+```
+
+
+> floating point matchers live in `catch2/matchers/catch_matchers_floating.hpp`
 
 
 ### Miscellaneous matchers
@@ -192,30 +224,20 @@ The other miscellaneous matcher utility is exception matching.
 
 #### Matching exceptions
 
-Catch2 provides a utility macro for asserting that an expression
+Catch2 provides an utility macro for asserting that an expression
 throws exception of specific type, and that the exception has desired
 properties. The macro is `REQUIRE_THROWS_MATCHES(expr, ExceptionType, Matcher)`.
 
 > `REQUIRE_THROWS_MATCHES` macro lives in `catch2/matchers/catch_matchers.hpp`
 
 
-Catch2 currently provides two matchers for exceptions.
-These are:
-* `Message(std::string message)`.
-* `MessageMatches(Matcher matcher)`.
-
-> `MessageMatches` was [introduced](https://github.com/catchorg/Catch2/pull/2570) in Catch2 3.3.0
-
-`Message` checks that the exception's
+Catch2 currently provides only one matcher for exceptions,
+`Message(std::string message)`. `Message` checks that the exception's
 message, as returned from `what` is exactly equal to `message`.
 
-`MessageMatches` applies the provided matcher on the exception's
-message, as returned from `what`. This is useful in conjunctions with the `std::string` matchers (e.g. `StartsWith`)
-
 Example use:
 ```cpp
 REQUIRE_THROWS_MATCHES(throwsDerivedException(),  DerivedException,  Message("DerivedException::what"));
-REQUIRE_THROWS_MATCHES(throwsDerivedException(),  DerivedException,  MessageMatches(StartsWith("DerivedException")));
 ```
 
 Note that `DerivedException` in the example above has to derive from
@@ -237,19 +259,11 @@ definitions to handle generic range-like types. These are:
 * `Contains(T&& target_element, Comparator = std::equal_to<>{})`
 * `Contains(Matcher element_matcher)`
 * `AllMatch(Matcher element_matcher)`
-* `AnyMatch(Matcher element_matcher)`
 * `NoneMatch(Matcher element_matcher)`
-* `AllTrue()`, `AnyTrue()`, `NoneTrue()`
-* `RangeEquals(TargetRangeLike&&, Comparator = std::equal_to<>{})`
-* `UnorderedRangeEquals(TargetRangeLike&&, Comparator = std::equal_to<>{})`
-
-> `IsEmpty`, `SizeIs`, `Contains` were introduced in Catch2 3.0.1
-
-> `All/Any/NoneMatch` were introduced in Catch2 3.0.1
-
-> `All/Any/NoneTrue` were introduced in Catch2 3.1.0
-
-> `RangeEquals` and `UnorderedRangeEquals` matchers were [introduced](https://github.com/catchorg/Catch2/pull/2377) in Catch2 3.3.0
+* `AnyMatch(Matcher element_matcher)`
+* `AllTrue()`
+* `NoneTrue()`
+* `AnyTrue()`
 
 `IsEmpty` should be self-explanatory. It successfully matches objects
 that are empty according to either `std::empty`, or ADL-found `empty`
@@ -268,33 +282,14 @@ in which case a range is accepted if any of its elements is accepted
 by the provided matcher.
 
 `AllMatch`, `NoneMatch`, and `AnyMatch` match ranges for which either
-all, none, or any of the contained elements matches the given matcher,
+all, none, or any of the contained elements matches the given matcher, 
 respectively.
 
 `AllTrue`, `NoneTrue`, and `AnyTrue` match ranges for which either
-all, none, or any of the contained elements are `true`, respectively.
-It works for ranges of `bool`s and ranges of elements (explicitly)
+all, none, or any of the contained elements are `true`, respectively. 
+It works for ranges of `bool`s and ranges of elements (explicitly) 
 convertible to `bool`.
 
-`RangeEquals` compares the range that the matcher is constructed with
-(the "target range") against the range to be tested, element-wise. The
-match succeeds if all elements from the two ranges compare equal (using
-`operator==` by default). The ranges do not need to be the same type,
-and the element types do not need to be the same, as long as they are
-comparable. (e.g. you may compare `std::vector<int>` to `std::array<char>`).
-
-`UnorderedRangeEquals` is similar to `RangeEquals`, but the order
-does not matter. For example "1, 2, 3" would match "3, 2, 1", but not
-"1, 1, 2, 3" As with `RangeEquals`, `UnorderedRangeEquals` compares
-the individual elements using using `operator==` by default.
-
-Both `RangeEquals` and `UnorderedRangeEquals` optionally accept a
-predicate which can be used to compare the containers element-wise.
-
-To check a container elementwise against a given matcher, use
-`AllMatch`.
-
-
 ## Writing custom matchers (old style)
 
 The old style of writing matchers has been introduced back in Catch
@@ -373,7 +368,7 @@ style matchers arbitrarily.
 
 To create a new-style matcher, you have to create your own type that
 derives from `Catch::Matchers::MatcherGenericBase`. Your type has to
-also provide two methods, `bool match( ... ) const` and overridden
+also provide two methods, `bool match( ... ) const` and overriden
 `std::string describe() const`.
 
 Unlike with old-style matchers, there are no requirements on how

docs/migrate-v2-to-v3.md

@@ -21,10 +21,9 @@ reduced by roughly 80%. The improved ease of maintenance also led to
 various runtime performance improvements and the introduction of new features.
 For details, look at [the release notes of 3.0.1](release-notes.md#301).
 
-_Note that we still provide one header + one translation unit (TU)
-distribution but do not consider it the primarily supported option. You
-should also expect that the compilation times will be worse if you use
-this option._
+_Note that we still provide one header + one TU distribution but do
+not consider it the primarily supported option. You should also expect
+that the compilation times will be worse if you use this option._
 
 
 ## How to migrate projects from v2 to v3
@@ -66,9 +65,7 @@ to piecemeal includes. You will likely want to start by including
 [other notes](#other-notes) for further ideas)
 
 ## Other notes
-
 * The main test include is now `<catch2/catch_test_macros.hpp>`
-
 * Big "subparts" like Matchers, or Generators, have their own folder, and
 also their own "big header", so if you just want to include all matchers,
 you can include `<catch2/matchers/catch_matchers_all.hpp>`,
@@ -76,21 +73,11 @@ or `<catch2/generators/catch_generators_all.hpp>`
 
 
 ## Things that can break during porting
-
-* The namespaces of Matchers were flattened and cleaned up.
-
-Matchers are no longer declared deep within an internal namespace and
-then brought up into `Catch` namespace. All Matchers now live in the
-`Catch::Matchers` namespace.
-
-* The `Contains` string matcher was renamed to `ContainsSubstring`.
-
-* The reporter interfaces changed in a breaking manner.
-
-If you are using a custom reporter or listener, you will likely need to
-modify them to conform to the new interfaces. Unlike before in v2,
-the [interfaces](reporters.md#top) and the [events](reporter-events.md#top)
-are now documented.
+* The namespace on Matchers were cleaned up, they are no longer first declared
+deep within an internal namespace and then brought up. All Matchers now live
+in `Catch::Matchers`.
+* The reporter interfaces changed in a breaking manner. If you wrote custom
+reporter or listener, you might need to modify them a bit.
 
 
 ---

docs/opensource-users.md

@@ -72,7 +72,7 @@ A header-only template engine for modern C++.
 A C++17 template header-only library for the abstraction of memory access patterns.
 
 ### [libcluon](https://github.com/chrberger/libcluon)
-A single-header-only library written in C++14 to glue distributed software components (UDP, TCP, shared memory) supporting natively Protobuf, LCM/ZCM, MsgPack, and JSON for dynamic message transformations in-between.
+A single-header-only library written in C++14 to glue distributed software components (UDP, TCP, shared memory) supporting natively Protobuf, LCM/ZCM, MsgPack, and JSON for dynamic message transformations in-between. 
 
 ### [MNMLSTC Core](https://github.com/mnmlstc/core)
 A small and easy to use C++11 library that adds a functionality set that will be available in C++14 and later, as well as some useful additions.
@@ -110,12 +110,6 @@ A header-only TOML parser and serializer for modern C++.
 ### [Trompeloeil](https://github.com/rollbear/trompeloeil)
 A thread-safe header-only mocking framework for C++14.
 
-### [wxWidgets](https://www.wxwidgets.org/)
-Cross-Platform C++ GUI Library.
-
-### [xmlwrapp](https://github.com/vslavik/xmlwrapp)
-C++ XML parsing library using libxml2.
-
 ## Applications & Tools
 
 ### [App Mesh](https://github.com/laoshanxi/app-mesh)

docs/release-notes.md

@@ -2,12 +2,6 @@
 
 # Release notes
 **Contents**<br>
-[3.3.2](#332)<br>
-[3.3.1](#331)<br>
-[3.3.0](#330)<br>
-[3.2.1](#321)<br>
-[3.2.0](#320)<br>
-[3.1.1](#311)<br>
 [3.1.0](#310)<br>
 [3.0.1](#301)<br>
 [2.13.7](#2137)<br>
@@ -56,143 +50,6 @@
 [Even Older versions](#even-older-versions)<br>
 
 
-
-## 3.3.2
-
-### Improvements
-* Further reduced allocations
-  * The compact, console, TAP and XML reporters perform less allocations in various cases
-  * Removed 1 allocation per entered `SECTION`/`TEST_CASE`.
-  * Removed 2 allocations per test case exit, if stdout/stderr is captured
-* Improved performance
-  * Section tracking is 10%-25% faster than in v3.3.0
-  * Assertion handling is 5%-10% faster than in v3.3.0
-  * Test case registration is 1%-2% faster than in v3.3.0
-  * Tiny speedup for registering listeners
-  * Tiny speedup for `CAPTURE`, `TEST_CASE_METHOD`, `METHOD_AS_TEST_CASE`, and `TEMPLATE_LIST_TEST_*` macros.
-* `Contains`, `RangeEquals` and `UnorderedRangeEquals` matchers now support ranges with iterator + sentinel pair
-* Added `IsNaN` matcher
-  * Unlike `REQUIRE(isnan(x))`, `REQUIRE_THAT(x, IsNaN())` shows you the value of `x`.
-* Suppressed `declared_but_not_referenced` warning for NVHPC (#2637)
-
-### Fixes
-* Fixed performance regression in section tracking introduced in v3.3.1
-  * Extreme cases would cause the tracking to run about 4x slower than in 3.3.0
-
-
-## 3.3.1
-
-### Improvements
-* Reduced allocations and improved performance
-  * The exact improvements are dependent on your usage of Catch2.
-  * For example running Catch2's SelfTest binary performs 8k less allocations.
-  * The main improvement comes from smarter handling of `SECTION`s, especially sibling `SECTION`s
-
-
-## 3.3.0
-
-### Improvements
-
-* Added `MessageMatches` exception matcher (#2570)
-* Added `RangeEquals` and `UnorderedRangeEquals` generic range matchers (#2377)
-* Added `SKIP` macro for skipping tests from within the test body (#2360)
-  * All built-in reporters have been extended to handle it properly, whether your custom reporter needs changes depends on how it was written
-  * `skipTest` reporter event **is unrelated** to this, and has been deprecated since it has practically no uses
-* Restored support for PPC Macs in the break-into-debugger functionality (#2619)
-* Made our warning suppression compatible with CUDA toolkit pre 11.5 (#2626)
-* Cleaned out some static analysis complaints
-
-
-### Fixes
-
-* Fixed macro redefinition warning when NVCC was reporting as MSVC (#2603)
-* Fixed throws in generator constructor causing the whole binary to abort (#2615)
-  * Now it just fails the test
-* Fixed missing transitive include with libstdc++13 (#2611)
-
-
-### Miscellaneous
-
-* Improved support for dynamic library build with non-MSVC compilers on Windows (#2630)
-* When used as a subproject, Catch2 keeps its generated header in a separate directory from the main project (#2604)
-
-
-
-## 3.2.1
-
-### Improvements
-* Fix the reworked decomposer to work with older (pre 9) GCC versions (#2571)
-  * **This required more significant changes to properly support C++20, there might be bugs.**
-
-
-## 3.2.0
-
-### Improvements
-* Catch2 now compiles on PlayStation (#2562)
-* Added `CATCH_CONFIG_GETENV` compile-time toggle (#2562)
-  * This toggle guards whether Catch2 calls `std::getenv` when reading env variables
-* Added support for more Bazel test environment variables
-  * `TESTBRIDGE_TEST_ONLY` is now supported (#2490)
-  * Sharding variables, `TEST_SHARD_INDEX`, `TEST_TOTAL_SHARDS`, `TEST_SHARD_STATUS_FILE`, are now all supported (#2491)
-* Bunch of small tweaks and improvements in reporters
-  * The TAP and SonarQube reporters output the used test filters
-  * The XML reporter now also reports the version of its output format
-  * The compact reporter now uses the same summary output as the console reporter (#878, #2554)
-* Added support for asserting on types that can only be compared with literal 0 (#2555)
-  * A canonical example is C++20's `std::*_ordering` types, which cannot be compared with an `int` variable, only `0`
-  * The support extends to any type with this property, not just the ones in stdlib
-  * This change imposes 2-3% slowdown on compiling files that are heavy on `REQUIRE` and friends
-  * **This required significant rewrite of decomposition, there might be bugs**
-* Simplified internals of matcher related macros
-  * This provides about ~2% speed up compiling files that are heavy on `REQUIRE_THAT` and friends
-
-
-### Fixes
-* Cleaned out some warnings and static analysis issues
-  * Suppressed `-Wcomma` warning rarely occuring in templated test cases (#2543)
-  * Constified implementation details in `INFO` (#2564)
-  * Made `MatcherGenericBase` copy constructor const (#2566)
-* Fixed serialization of test filters so the output roundtrips
-  * This means that e.g. `./tests/SelfTest "aaa bbb", [approx]` outputs `Filters: "aaa bbb",[approx]`
-
-
-### Miscellaneous
-* Catch2's build no longer leaks `-ffile-prefix-map` setting  to dependees (#2533)
-
-
-
-## 3.1.1
-
-### Improvements
-* Added `Catch::getSeed` function that user code can call to retrieve current rng-seed
-* Better detection of compiler support for `-ffile-prefix-map` (#2517)
-* Catch2's shared libraries now have `SOVERSION` set (#2516)
-* `catch2/catch_all.hpp` convenience header no longer transitively includes `windows.h` (#2432, #2526)
-
-
-### Fixes
-* Fixed compilation on Universal Windows Platform
-* Fixed compilation on VxWorks (#2515)
-* Fixed compilation on Cygwin (#2540)
-* Remove unused variable in reporter registration (#2538)
-* Fixed some symbol visibility issues with dynamic library on Windows (#2527)
-* Suppressed `-Wuseless-cast` warnings in `REQUIRE_THROWS*` macros (#2520, #2521)
-  * This was triggered when the potentially throwing expression evaluates to `void`
-* Fixed "warning: storage class is not first" with `nvc++` (#2533)
-* Fixed handling of `DL_PATHS` argument to `catch_discover_tests` on MacOS (#2483)
-* Suppressed `*-avoid-c-arrays` clang-tidy warning in `TEMPLATE_TEST_CASE` (#2095, #2536)
-
-
-### Miscellaneous
-* Fixed CMake install step for Catch2 build as dynamic library (#2485)
-* Raised minimum CMake version to 3.10 (#2523)
-  * Expect the minimum CMake version to increase once more in next few releases.
-* Whole bunch of doc updates and fixes
-  * #1444, #2497, #2547, #2549, and more
-* Added support for building Catch2 with Meson (#2530, #2539)
-
-
-
 ## 3.1.0
 
 ### Improvements
@@ -558,7 +415,7 @@ v3 releases.
 ### Improvements
 * `std::result_of` is not used if `std::invoke_result` is available (#1934)
 * JUnit reporter writes out `status` attribute for tests (#1899)
-* Suppressed clang-tidy's `hicpp-vararg` warning (#1921)
+* Suppresed clang-tidy's `hicpp-vararg` warning (#1921)
   * Catch2 was already suppressing the `cppcoreguidelines-pro-type-vararg` alias of the warning
 
 

docs/reporter-events.md

@@ -138,7 +138,7 @@ benchmarking itself fails.
 > Introduced in Catch2 3.0.1.
 
 Listings events are events that correspond to the test binary being
-invoked with `--list-foo` flag.
+invoked with `--list-foo` flag. 
 
 There are currently 3 listing events, one for reporters, one for tests,
 and one for tags. Note that they are not exclusive to each other.

docs/skipping-passing-failing.md

@@ -1,129 +0,0 @@
-<a id="top"></a>
-# Explicitly skipping, passing, and failing tests at runtime
-
-## Skipping Test Cases at Runtime
-
-> [Introduced](https://github.com/catchorg/Catch2/pull/2360) in Catch2 3.3.0.
-
-In some situations it may not be possible to meaningfully execute a test case,
-for example when the system under test is missing certain hardware capabilities.
-If the required conditions can only be determined at runtime, it often
-doesn't make sense to consider such a test case as either passed or failed,
-because it simply can not run at all.
-
-To properly express such scenarios, Catch2 provides a way to explicitly
-_skip_ test cases, using the `SKIP` macro:
-
-```
-SKIP( [streamable expression] )
-```
-
-Example usage:
-
-```c++
-TEST_CASE("copy files between drives") {
-    if(getNumberOfHardDrives() < 2) {
-        SKIP("at least two hard drives required");
-    }
-    // ...
-}
-```
-
-This test case is then reported as _skipped_ instead of _passed_ or _failed_.
-
-The `SKIP` macro behaves similarly to an explicit [`FAIL`](#passing-and-failing-test-cases),
-in that it is the last expression that will be executed:
-
-```c++
-TEST_CASE("my test") {
-    printf("foo");
-    SKIP();
-    printf("bar"); // not printed
-}
-```
-
-However a failed assertion _before_ a `SKIP` still causes the entire
-test case to fail:
-
-```c++
-TEST_CASE("failing test") {
-    CHECK(1 == 2);
-    SKIP();
-}
-```
-
-### Interaction with Sections and Generators
-
-Sections, nested sections as well as specific outputs from [generators](generators.md#top)
-can all be individually skipped, with the rest executing as usual:
-
-```c++
-TEST_CASE("complex test case") {
-  int value = GENERATE(2, 4, 6);
-  SECTION("a") {
-    SECTION("a1") { CHECK(value < 8); }
-    SECTION("a2") {
-      if (value == 4) {
-        SKIP();
-      }
-      CHECK(value % 2 == 0);
-    }
-  }
-}
-```
-
-This test case will report 5 passing assertions; one for each of the three
-values in section `a1`, and then two in section `a2`, from values 2 and 4.
-
-Note that as soon as one section is skipped, the entire test case will
-be reported as _skipped_ (unless there is a failing assertion, in which
-case the test is handled as _failed_ instead).
-
-Note that if all test cases in a run are skipped, Catch2 returns a non-zero
-exit code, same as it does if no test cases have run. This behaviour can
-be overridden using the [--allow-running-no-tests](command-line.md#no-tests-override)
-flag.
-
-
-## Passing and failing test cases
-
-Test cases can also be explicitly passed or failed, without the use of
-assertions, and with a specific message. This can be useful to handle
-complex preconditions/postconditions and give useful error messages
-when they fail.
-
-* `SUCCEED( [streamable expression] )`
-
-`SUCCEED` is morally equivalent with `INFO( [streamable expression] ); REQUIRE( true );`.
-Note that it does not stop further test execution, so it cannot be used
-to guard failing assertions from being executed.
-
-_In practice, `SUCCEED` is usually used as a test placeholder, to avoid
-[failing a test case due to missing assertions](command-line.md#warnings)._
-
-```cpp
-TEST_CASE( "SUCCEED showcase" ) {
-    int I = 1;
-    SUCCEED( "I is " << I );
-    // ... execution continues here ...
-}
-```
-
-* `FAIL( [streamable expression] )`
-
-`FAIL` is morally equivalent with `INFO( [streamable expression] ); REQUIRE( false );`.
-
-_In practice, `FAIL` is usually used to stop executing test that is currently
-known to be broken, but has to be fixed later._
-
-```cpp
-TEST_CASE( "FAIL showcase" ) {
-    FAIL( "This test case causes segfault, which breaks CI." );
-    // ... this will not be executed ...
-}
-```
-
-
----
-
-[Home](Readme.md#top)

docs/test-cases-and-sections.md

@@ -25,8 +25,7 @@ _section description_ can be used to provide long form description
 of a section while keeping the _section name_ short for use with the
 [`-c` command line parameter](command-line.md#specify-the-section-to-run).
 
-**The combination of test names and tags must be unique within the Catch2
-executable.**
+**Test names must be unique within the Catch executable.**
 
 For examples see the [Tutorial](tutorial.md#top)
 
@@ -69,8 +68,7 @@ All tag names beginning with non-alphanumeric characters are reserved by Catch.
 
 * `[!nonportable]` - Indicates that behaviour may vary between platforms or compilers.
 
-* `[#<filename>]` - these tags are added to test cases when you run Catch2
-                    with [`-#` or `--filenames-as-tags`](command-line.md#filenames-as-tags).
+* `[#<filename>]` - running with `-#` or `--filenames-as-tags` causes Catch to add the filename, prefixed with `#` (and with any extension stripped), as a tag to all contained tests, e.g. tests in testfile.cpp would all be tagged `[#testfile]`.
 
 * `[@<alias>]` - tag aliases all begin with `@` (see below).
 
@@ -169,11 +167,7 @@ Other than the additional prefixes and the formatting in the console reporter th
 
 In addition to `TEST_CASE`s, Catch2 also supports test cases parametrised
 by types, in the form of `TEMPLATE_TEST_CASE`,
-`TEMPLATE_PRODUCT_TEST_CASE` and `TEMPLATE_LIST_TEST_CASE`. These macros
-are defined in the `catch_template_test_macros.hpp` header, so compiling
-the code examples below also requires
-`#include <catch2/catch_template_test_macros.hpp>`.
-
+`TEMPLATE_PRODUCT_TEST_CASE` and `TEMPLATE_LIST_TEST_CASE`.
 
 * **TEMPLATE_TEST_CASE(** _test name_ , _tags_,  _type1_, _type2_, ..., _typen_ **)**
 
@@ -295,9 +289,7 @@ TEMPLATE_LIST_TEST_CASE("Template test case with test types specified inside std
 In addition to [type parametrised test cases](#type-parametrised-test-cases) Catch2 also supports
 signature base parametrised test cases, in form of `TEMPLATE_TEST_CASE_SIG` and `TEMPLATE_PRODUCT_TEST_CASE_SIG`.
 These test cases have similar syntax like [type parametrised test cases](#type-parametrised-test-cases), with one
-additional positional argument which specifies the signature. These macros are defined in the
-`catch_template_test_macros.hpp` header, so compiling the code examples below also requires
-`#include <catch2/catch_template_test_macros.hpp>`.
+additional positional argument which specifies the signature.
 
 ### Signature
 Signature has some strict rules for these tests cases to work properly:

docs/test-fixtures.md

@@ -3,7 +3,7 @@
 
 ## Defining test fixtures
 
-Although Catch allows you to group tests together as [sections within a test case](test-cases-and-sections.md), it can still be convenient, sometimes, to group them using a more traditional test fixture. Catch fully supports this too. You define the test fixture as a simple structure:
+Although Catch allows you to group tests together as sections within a test case, it can still be convenient, sometimes, to group them using a more traditional test fixture. Catch fully supports this too. You define the test fixture as a simple structure:
 
 ```c++
 class UniqueTestsFixture {
@@ -130,9 +130,9 @@ struct Template_Foo_2 {
 };
 
 TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG(
-    Template_Fixture_2,
-    "A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds",
-    "[class][template][product][nttp]",
+    Template_Fixture_2, 
+    "A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds", 
+    "[class][template][product][nttp]", 
     ((typename T, size_t S), T, S),
     (std::array, Template_Foo_2),
     ((int,2), (float,6))) {

docs/tutorial.md

@@ -13,10 +13,9 @@
 ## Getting Catch2
 
 Ideally you should be using Catch2 through its [CMake integration](cmake-integration.md#top).
-Catch2 also provides pkg-config files and two file (header + cpp)
-distribution, but this documentation will assume you are using CMake. If
-you are using the two file distribution instead, remember to replace
-the included header with `catch_amalgamated.hpp`.
+Catch2 also provides pkg-config files and single TU distribution, but this
+documentation will assume you are using CMake. If you are using single-TU
+distribution instead, remember to replace the included header with `catch_amalgamated.hpp`.
 
 
 ## Writing tests
@@ -100,7 +99,7 @@ before we move on.
   It accepts a boolean expression, and uses expression templates to
   internally decompose it, so that it can be individually stringified
   on test failure.
-
+  
 On the last point, note that there are more testing macros available,
 because not all useful checks can be expressed as a simple boolean
 expression. As an example, checking that an expression throws an exception
@@ -178,7 +177,7 @@ To continue on the vector example above, you could add a check that
     }
 ```
 
-Another way to look at sections is that they are a way to define a tree
+Another way to look at sections is that they are a way to define a tree 
 of paths through the test. Each section represents a node, and the final
 tree is walked in depth-first manner, with each path only visiting only
 one leaf node.

docs/usage-tips.md

@@ -47,7 +47,7 @@ Catch2 also supports [splitting tests in a binary into multiple
 shards](command-line.md#test-sharding). This can be used by any test
 runner to run batches of tests in parallel. Do note that when selecting
 on the number of shards, you should have more shards than there are cores,
-to avoid issues with long-running tests getting accidentally grouped in
+to avoid issues with long running tests getting accidentally grouped in
 the same shard, and causing long-tailed execution time.
 
 **Note that naively composing sharding and random ordering of tests will break.**
@@ -73,11 +73,6 @@ seed, e.g.
 ./tests --order rand --shard-index 2 --shard-count 3 --rng-seed 0xBEEF
 ```
 
-Catch2 actually provides a helper to automatically register multiple shards
-as CTest tests, with shared random seed that changes each CTest invocation.
-For details look at the documentation of
-[`CatchShardTests.cmake` CMake script](cmake-integration.md#catchshardtestscmake).
-
 
 ## Organizing tests into binaries
 

docs/why-catch.md

@@ -41,7 +41,7 @@ So what does Catch2 bring to the party that differentiates it from these? Apart
 
 ## Who else is using Catch2?
 
-A whole lot of people. According to the 2021 JetBrains C++ ecosystem survey,
+A whole lot of people. According to the 2021 Jetbrains C++ ecosystem survey,
 about 11% of C++ programmers use Catch2 for unit testing, making it the
 second most popular unit testing framework.
 

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 3.10 )
+cmake_minimum_required( VERSION 3.5 )
 
 project( Catch2Examples LANGUAGES CXX )
 
@@ -54,6 +54,8 @@ set(ALL_EXAMPLE_TARGETS
 
 foreach( name ${ALL_EXAMPLE_TARGETS} )
     target_link_libraries( ${name} Catch2 Catch2WithMain )
+    set_property(TARGET ${name} PROPERTY CXX_STANDARD 14)
+    set_property(TARGET ${name} PROPERTY CXX_EXTENSIONS OFF)
 endforeach()
 
 

extras/CatchAddTests.cmake

@@ -17,8 +17,6 @@ set(tests)
 
 if(WIN32)
   set(dl_paths_variable_name PATH)
-elseif(APPLE)
-  set(dl_paths_variable_name DYLD_LIBRARY_PATH)
 else()
   set(dl_paths_variable_name LD_LIBRARY_PATH)
 endif()

extras/CatchShardTests.cmake

@@ -1,7 +1,7 @@
 
 #              Copyright Catch2 Authors
 # Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
+#   (See accompanying file LICENSE_1_0.txt or copy at
 #        https://www.boost.org/LICENSE_1_0.txt)
 
 # SPDX-License-Identifier: BSL-1.0
@@ -46,7 +46,7 @@ function(catch_add_sharded_tests TARGET)
     APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
   )
 
-  set(shard_impl_script_file "${_CATCH_DISCOVER_SHARD_TESTS_IMPL_SCRIPT}")
+  set(shard_impl_script_file "${CMAKE_CURRENT_LIST_DIR}/CatchShardTestsImpl.cmake")
 
   add_custom_command(
     TARGET ${TARGET} POST_BUILD
@@ -64,11 +64,3 @@ function(catch_add_sharded_tests TARGET)
 
 
 endfunction()
-
-
-###############################################################################
-
-set(_CATCH_DISCOVER_SHARD_TESTS_IMPL_SCRIPT
-    ${CMAKE_CURRENT_LIST_DIR}/CatchShardTestsImpl.cmake
-  CACHE INTERNAL "Catch2 full path to CatchShardTestsImpl.cmake helper file"
-)

extras/CatchShardTestsImpl.cmake

@@ -1,7 +1,7 @@
 
 #              Copyright Catch2 Authors
 # Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
+#   (See accompanying file LICENSE_1_0.txt or copy at
 #        https://www.boost.org/LICENSE_1_0.txt)
 
 # SPDX-License-Identifier: BSL-1.0

meson.build

@@ -1,17 +0,0 @@
-#              Copyright Catch2 Authors
-# Distributed under the Boost Software License, Version 1.0.
-#   (See accompanying file LICENSE.txt or copy at
-#        https://www.boost.org/LICENSE_1_0.txt)
-
-# SPDX-License-Identifier: BSL-1.0
-
-project(
-  'catch2',
-  'cpp',
-  version: '3.3.2', # CML version placeholder, don't delete
-  license: 'BSL-1.0',
-  meson_version: '>=0.50.0',
-)
-
-subdir('src/catch2')
-subdir('tests')

src/CMakeLists.txt

@@ -7,330 +7,291 @@ include(CatchMiscFunctions)
 set(Catch2_GUID_CMAKE "8d538cbe-01bf-4a2e-a98a-6c368fdf13d7" CACHE INTERNAL "Project GUID")
 set(Catch2WithMain_GUID_CMAKE "8bd3552a-2cfb-4a59-ab15-2031b97ada1e" CACHE INTERNAL "Project GUID")
 
+# Please keep these ordered alphabetically
 set(BENCHMARK_HEADERS
-  ${SOURCES_DIR}/benchmark/catch_benchmark.hpp
-  ${SOURCES_DIR}/benchmark/catch_benchmark_all.hpp
-  ${SOURCES_DIR}/benchmark/catch_chronometer.hpp
-  ${SOURCES_DIR}/benchmark/catch_clock.hpp
-  ${SOURCES_DIR}/benchmark/catch_constructor.hpp
-  ${SOURCES_DIR}/benchmark/catch_environment.hpp
-  ${SOURCES_DIR}/benchmark/catch_estimate.hpp
-  ${SOURCES_DIR}/benchmark/catch_execution_plan.hpp
-  ${SOURCES_DIR}/benchmark/catch_optimizer.hpp
-  ${SOURCES_DIR}/benchmark/catch_outlier_classification.hpp
-  ${SOURCES_DIR}/benchmark/catch_sample_analysis.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_analyse.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_complete_invoke.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_estimate_clock.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_measure.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_repeat.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_stats.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_timing.hpp
+    ${SOURCES_DIR}/benchmark/catch_benchmark.hpp
+    ${SOURCES_DIR}/benchmark/catch_benchmark_all.hpp
+    ${SOURCES_DIR}/benchmark/catch_chronometer.hpp
+    ${SOURCES_DIR}/benchmark/catch_clock.hpp
+    ${SOURCES_DIR}/benchmark/catch_constructor.hpp
+    ${SOURCES_DIR}/benchmark/catch_environment.hpp
+    ${SOURCES_DIR}/benchmark/catch_estimate.hpp
+    ${SOURCES_DIR}/benchmark/catch_execution_plan.hpp
+    ${SOURCES_DIR}/benchmark/catch_optimizer.hpp
+    ${SOURCES_DIR}/benchmark/catch_outlier_classification.hpp
+    ${SOURCES_DIR}/benchmark/catch_sample_analysis.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_analyse.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_complete_invoke.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_estimate_clock.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_measure.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_repeat.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_stats.hpp
+    ${SOURCES_DIR}/benchmark/detail/catch_timing.hpp
 )
 set(BENCHMARK_SOURCES
-  ${SOURCES_DIR}/benchmark/catch_chronometer.cpp
-  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.cpp
-  ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.cpp
-  ${SOURCES_DIR}/benchmark/detail/catch_stats.cpp
+    ${SOURCES_DIR}/benchmark/catch_chronometer.cpp
+    ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.cpp
+    ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.cpp
+    ${SOURCES_DIR}/benchmark/detail/catch_stats.cpp
 )
-set(BENCHMARK_FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
 
+SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
 
-set(IMPL_HEADERS
- "${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
-  ${SOURCES_DIR}/catch_user_config.hpp.in
-  ${SOURCES_DIR}/catch_all.hpp
-  ${SOURCES_DIR}/catch_approx.hpp
-  ${SOURCES_DIR}/catch_assertion_info.hpp
-  ${SOURCES_DIR}/catch_assertion_result.hpp
-  ${SOURCES_DIR}/catch_config.hpp
-  ${SOURCES_DIR}/catch_get_random_seed.hpp
-  ${SOURCES_DIR}/catch_message.hpp
-  ${SOURCES_DIR}/catch_section_info.hpp
-  ${SOURCES_DIR}/catch_session.hpp
-  ${SOURCES_DIR}/catch_tag_alias.hpp
-  ${SOURCES_DIR}/catch_tag_alias_autoregistrar.hpp
-  ${SOURCES_DIR}/catch_template_test_macros.hpp
-  ${SOURCES_DIR}/catch_test_case_info.hpp
-  ${SOURCES_DIR}/catch_test_macros.hpp
-  ${SOURCES_DIR}/catch_test_run_info.hpp
-  ${SOURCES_DIR}/catch_test_spec.hpp
-  ${SOURCES_DIR}/catch_timer.hpp
-  ${SOURCES_DIR}/catch_tostring.hpp
-  ${SOURCES_DIR}/catch_totals.hpp
-  ${SOURCES_DIR}/catch_translate_exception.hpp
-  ${SOURCES_DIR}/catch_version.hpp
-  ${SOURCES_DIR}/catch_version_macros.hpp
-  ${SOURCES_DIR}/internal/catch_assertion_handler.hpp
-  ${SOURCES_DIR}/internal/catch_benchmark_stats_fwd.hpp
-  ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.hpp
-  ${SOURCES_DIR}/internal/catch_case_sensitive.hpp
-  ${SOURCES_DIR}/internal/catch_clara.hpp
-  ${SOURCES_DIR}/internal/catch_commandline.hpp
-  ${SOURCES_DIR}/internal/catch_compare_traits.hpp
-  ${SOURCES_DIR}/internal/catch_compiler_capabilities.hpp
-  ${SOURCES_DIR}/internal/catch_config_android_logwrite.hpp
-  ${SOURCES_DIR}/internal/catch_config_counter.hpp
-  ${SOURCES_DIR}/internal/catch_config_uncaught_exceptions.hpp
-  ${SOURCES_DIR}/internal/catch_config_wchar.hpp
-  ${SOURCES_DIR}/internal/catch_console_colour.hpp
-  ${SOURCES_DIR}/internal/catch_console_width.hpp
-  ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp
-  ${SOURCES_DIR}/internal/catch_context.hpp
-  ${SOURCES_DIR}/internal/catch_debug_console.hpp
-  ${SOURCES_DIR}/internal/catch_debugger.hpp
-  ${SOURCES_DIR}/internal/catch_decomposer.hpp
-  ${SOURCES_DIR}/internal/catch_enforce.hpp
-  ${SOURCES_DIR}/internal/catch_enum_values_registry.hpp
-  ${SOURCES_DIR}/internal/catch_errno_guard.hpp
-  ${SOURCES_DIR}/internal/catch_exception_translator_registry.hpp
-  ${SOURCES_DIR}/internal/catch_fatal_condition_handler.hpp
-  ${SOURCES_DIR}/internal/catch_floating_point_helpers.hpp
-  ${SOURCES_DIR}/internal/catch_getenv.hpp
-  ${SOURCES_DIR}/internal/catch_istream.hpp
-  ${SOURCES_DIR}/internal/catch_is_permutation.hpp
-  ${SOURCES_DIR}/internal/catch_lazy_expr.hpp
-  ${SOURCES_DIR}/internal/catch_leak_detector.hpp
-  ${SOURCES_DIR}/internal/catch_list.hpp
-  ${SOURCES_DIR}/internal/catch_logical_traits.hpp
-  ${SOURCES_DIR}/internal/catch_message_info.hpp
-  ${SOURCES_DIR}/internal/catch_meta.hpp
-  ${SOURCES_DIR}/internal/catch_move_and_forward.hpp
-  ${SOURCES_DIR}/internal/catch_noncopyable.hpp
-  ${SOURCES_DIR}/internal/catch_optional.hpp
-  ${SOURCES_DIR}/internal/catch_output_redirect.hpp
-  ${SOURCES_DIR}/internal/catch_parse_numbers.hpp
-  ${SOURCES_DIR}/internal/catch_platform.hpp
-  ${SOURCES_DIR}/internal/catch_polyfills.hpp
-  ${SOURCES_DIR}/internal/catch_preprocessor.hpp
-  ${SOURCES_DIR}/internal/catch_preprocessor_remove_parens.hpp
-  ${SOURCES_DIR}/internal/catch_random_number_generator.hpp
-  ${SOURCES_DIR}/internal/catch_random_seed_generation.hpp
-  ${SOURCES_DIR}/internal/catch_registry_hub.hpp
-  ${SOURCES_DIR}/internal/catch_reporter_registry.hpp
-  ${SOURCES_DIR}/internal/catch_reporter_spec_parser.hpp
-  ${SOURCES_DIR}/internal/catch_result_type.hpp
-  ${SOURCES_DIR}/internal/catch_reusable_string_stream.hpp
-  ${SOURCES_DIR}/internal/catch_run_context.hpp
-  ${SOURCES_DIR}/internal/catch_section.hpp
-  ${SOURCES_DIR}/internal/catch_sharding.hpp
-  ${SOURCES_DIR}/internal/catch_singletons.hpp
-  ${SOURCES_DIR}/internal/catch_source_line_info.hpp
-  ${SOURCES_DIR}/internal/catch_startup_exception_registry.hpp
-  ${SOURCES_DIR}/internal/catch_stdstreams.hpp
-  ${SOURCES_DIR}/internal/catch_stream_end_stop.hpp
-  ${SOURCES_DIR}/internal/catch_string_manip.hpp
-  ${SOURCES_DIR}/internal/catch_stringref.hpp
-  ${SOURCES_DIR}/internal/catch_tag_alias_registry.hpp
-  ${SOURCES_DIR}/internal/catch_template_test_registry.hpp
-  ${SOURCES_DIR}/internal/catch_test_case_info_hasher.hpp
-  ${SOURCES_DIR}/internal/catch_test_case_registry_impl.hpp
-  ${SOURCES_DIR}/internal/catch_test_case_tracker.hpp
-  ${SOURCES_DIR}/internal/catch_test_failure_exception.hpp
-  ${SOURCES_DIR}/internal/catch_test_macro_impl.hpp
-  ${SOURCES_DIR}/internal/catch_test_registry.hpp
-  ${SOURCES_DIR}/internal/catch_test_spec_parser.hpp
-  ${SOURCES_DIR}/internal/catch_textflow.hpp
-  ${SOURCES_DIR}/internal/catch_to_string.hpp
-  ${SOURCES_DIR}/internal/catch_uncaught_exceptions.hpp
-  ${SOURCES_DIR}/internal/catch_unique_name.hpp
-  ${SOURCES_DIR}/internal/catch_unique_ptr.hpp
-  ${SOURCES_DIR}/internal/catch_void_type.hpp
-  ${SOURCES_DIR}/internal/catch_wildcard_pattern.hpp
-  ${SOURCES_DIR}/internal/catch_windows_h_proxy.hpp
-  ${SOURCES_DIR}/internal/catch_xmlwriter.hpp
+set(INTERNAL_HEADERS
+   "${CMAKE_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
+   "${SOURCES_DIR}/catch_user_config.hpp.in"
+    ${SOURCES_DIR}/catch_all.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_all.hpp
+    ${SOURCES_DIR}/generators/catch_generators_all.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_all.hpp
+    ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.hpp
+    ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.hpp
+    ${SOURCES_DIR}/internal/catch_console_width.hpp
+    ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp
+    ${SOURCES_DIR}/internal/catch_noncopyable.hpp
+    ${SOURCES_DIR}/catch_approx.hpp
+    ${SOURCES_DIR}/internal/catch_assertion_handler.hpp
+    ${SOURCES_DIR}/catch_assertion_info.hpp
+    ${SOURCES_DIR}/catch_assertion_result.hpp
+    ${SOURCES_DIR}/internal/catch_test_macro_impl.hpp
+    ${SOURCES_DIR}/internal/catch_test_failure_exception.hpp
+    ${SOURCES_DIR}/internal/catch_case_sensitive.hpp
+    ${SOURCES_DIR}/internal/catch_clara.hpp
+    ${SOURCES_DIR}/internal/catch_commandline.hpp
+    ${SOURCES_DIR}/internal/catch_source_line_info.hpp
+    ${SOURCES_DIR}/internal/catch_compiler_capabilities.hpp
+    ${SOURCES_DIR}/catch_config.hpp
+    ${SOURCES_DIR}/internal/catch_config_android_logwrite.hpp
+    ${SOURCES_DIR}/internal/catch_config_counter.hpp
+    ${SOURCES_DIR}/internal/catch_config_uncaught_exceptions.hpp
+    ${SOURCES_DIR}/internal/catch_config_wchar.hpp
+    ${SOURCES_DIR}/internal/catch_console_colour.hpp
+    ${SOURCES_DIR}/internal/catch_context.hpp
+    ${SOURCES_DIR}/internal/catch_debug_console.hpp
+    ${SOURCES_DIR}/internal/catch_debugger.hpp
+    ${SOURCES_DIR}/internal/catch_decomposer.hpp
+    ${SOURCES_DIR}/internal/catch_enforce.hpp
+    ${SOURCES_DIR}/internal/catch_enum_values_registry.hpp
+    ${SOURCES_DIR}/internal/catch_errno_guard.hpp
+    ${SOURCES_DIR}/internal/catch_exception_translator_registry.hpp
+    ${SOURCES_DIR}/internal/catch_fatal_condition_handler.hpp
+    ${SOURCES_DIR}/internal/catch_floating_point_helpers.hpp
+    ${SOURCES_DIR}/internal/catch_istream.hpp
+    ${SOURCES_DIR}/internal/catch_unique_name.hpp
+    ${SOURCES_DIR}/internal/catch_sharding.hpp
+    ${SOURCES_DIR}/generators/catch_generator_exception.hpp
+    ${SOURCES_DIR}/generators/catch_generators.hpp
+    ${SOURCES_DIR}/generators/catch_generators_adapters.hpp
+    ${SOURCES_DIR}/generators/catch_generators_random.hpp
+    ${SOURCES_DIR}/generators/catch_generators_range.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_capture.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_config.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_enum_values_registry.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_exception.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_registry.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_tag_alias_registry.hpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.hpp
+    ${SOURCES_DIR}/internal/catch_lazy_expr.hpp
+    ${SOURCES_DIR}/internal/catch_leak_detector.hpp
+    ${SOURCES_DIR}/internal/catch_list.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_container_properties.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_contains.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_exception.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_floating_point.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_predicate.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_quantifiers.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_string.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_templated.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_vector.hpp
+    ${SOURCES_DIR}/catch_message.hpp
+    ${SOURCES_DIR}/internal/catch_message_info.hpp
+    ${SOURCES_DIR}/internal/catch_meta.hpp
+    ${SOURCES_DIR}/internal/catch_move_and_forward.hpp
+    ${SOURCES_DIR}/internal/catch_optional.hpp
+    ${SOURCES_DIR}/internal/catch_output_redirect.hpp
+    ${SOURCES_DIR}/internal/catch_platform.hpp
+    ${SOURCES_DIR}/internal/catch_polyfills.hpp
+    ${SOURCES_DIR}/internal/catch_preprocessor.hpp
+    ${SOURCES_DIR}/internal/catch_preprocessor_remove_parens.hpp
+    ${SOURCES_DIR}/internal/catch_random_number_generator.hpp
+    ${SOURCES_DIR}/internal/catch_random_seed_generation.hpp
+    ${SOURCES_DIR}/internal/catch_reporter_registry.hpp
+    ${SOURCES_DIR}/internal/catch_reporter_spec_parser.hpp
+    ${SOURCES_DIR}/internal/catch_result_type.hpp
+    ${SOURCES_DIR}/internal/catch_run_context.hpp
+    ${SOURCES_DIR}/internal/catch_section.hpp
+    ${SOURCES_DIR}/internal/catch_stdstreams.hpp
+    ${SOURCES_DIR}/catch_section_info.hpp
+    ${SOURCES_DIR}/catch_session.hpp
+    ${SOURCES_DIR}/internal/catch_singletons.hpp
+    ${SOURCES_DIR}/internal/catch_startup_exception_registry.hpp
+    ${SOURCES_DIR}/internal/catch_reusable_string_stream.hpp
+    ${SOURCES_DIR}/internal/catch_stream_end_stop.hpp
+    ${SOURCES_DIR}/internal/catch_string_manip.hpp
+    ${SOURCES_DIR}/internal/catch_stringref.hpp
+    ${SOURCES_DIR}/catch_tag_alias.hpp
+    ${SOURCES_DIR}/catch_tag_alias_autoregistrar.hpp
+    ${SOURCES_DIR}/internal/catch_tag_alias_registry.hpp
+    ${SOURCES_DIR}/catch_test_case_info.hpp
+    ${SOURCES_DIR}/internal/catch_test_case_registry_impl.hpp
+    ${SOURCES_DIR}/internal/catch_test_case_tracker.hpp
+    ${SOURCES_DIR}/catch_template_test_macros.hpp
+    ${SOURCES_DIR}/catch_test_macros.hpp
+    ${SOURCES_DIR}/internal/catch_template_test_registry.hpp
+    ${SOURCES_DIR}/internal/catch_test_registry.hpp
+    ${SOURCES_DIR}/catch_test_spec.hpp
+    ${SOURCES_DIR}/internal/catch_test_spec_parser.hpp
+    ${SOURCES_DIR}/internal/catch_textflow.hpp
+    ${SOURCES_DIR}/catch_timer.hpp
+    ${SOURCES_DIR}/internal/catch_to_string.hpp
+    ${SOURCES_DIR}/catch_tostring.hpp
+    ${SOURCES_DIR}/catch_totals.hpp
+    ${SOURCES_DIR}/catch_translate_exception.hpp
+    ${SOURCES_DIR}/internal/catch_uncaught_exceptions.hpp
+    ${SOURCES_DIR}/internal/catch_unique_ptr.hpp
+    ${SOURCES_DIR}/internal/catch_void_type.hpp
+    ${SOURCES_DIR}/catch_version.hpp
+    ${SOURCES_DIR}/catch_version_macros.hpp
+    ${SOURCES_DIR}/internal/catch_wildcard_pattern.hpp
+    ${SOURCES_DIR}/internal/catch_windows_h_proxy.hpp
+    ${SOURCES_DIR}/internal/catch_xmlwriter.hpp
+    ${SOURCES_DIR}/internal/catch_test_case_info_hasher.hpp
 )
 set(IMPL_SOURCES
-  ${SOURCES_DIR}/catch_approx.cpp
-  ${SOURCES_DIR}/catch_assertion_result.cpp
-  ${SOURCES_DIR}/catch_config.cpp
-  ${SOURCES_DIR}/catch_get_random_seed.cpp
-  ${SOURCES_DIR}/catch_message.cpp
-  ${SOURCES_DIR}/catch_session.cpp
-  ${SOURCES_DIR}/catch_tag_alias_autoregistrar.cpp
-  ${SOURCES_DIR}/catch_test_case_info.cpp
-  ${SOURCES_DIR}/catch_test_spec.cpp
-  ${SOURCES_DIR}/catch_timer.cpp
-  ${SOURCES_DIR}/catch_tostring.cpp
-  ${SOURCES_DIR}/catch_totals.cpp
-  ${SOURCES_DIR}/catch_translate_exception.cpp
-  ${SOURCES_DIR}/catch_version.cpp
-  ${SOURCES_DIR}/internal/catch_assertion_handler.cpp
-  ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.cpp
-  ${SOURCES_DIR}/internal/catch_clara.cpp
-  ${SOURCES_DIR}/internal/catch_commandline.cpp
-  ${SOURCES_DIR}/internal/catch_console_colour.cpp
-  ${SOURCES_DIR}/internal/catch_context.cpp
-  ${SOURCES_DIR}/internal/catch_debug_console.cpp
-  ${SOURCES_DIR}/internal/catch_debugger.cpp
-  ${SOURCES_DIR}/internal/catch_decomposer.cpp
-  ${SOURCES_DIR}/internal/catch_enforce.cpp
-  ${SOURCES_DIR}/internal/catch_enum_values_registry.cpp
-  ${SOURCES_DIR}/internal/catch_errno_guard.cpp
-  ${SOURCES_DIR}/internal/catch_exception_translator_registry.cpp
-  ${SOURCES_DIR}/internal/catch_fatal_condition_handler.cpp
-  ${SOURCES_DIR}/internal/catch_floating_point_helpers.cpp
-  ${SOURCES_DIR}/internal/catch_getenv.cpp
-  ${SOURCES_DIR}/internal/catch_istream.cpp
-  ${SOURCES_DIR}/internal/catch_lazy_expr.cpp
-  ${SOURCES_DIR}/internal/catch_leak_detector.cpp
-  ${SOURCES_DIR}/internal/catch_list.cpp
-  ${SOURCES_DIR}/internal/catch_message_info.cpp
-  ${SOURCES_DIR}/internal/catch_output_redirect.cpp
-  ${SOURCES_DIR}/internal/catch_parse_numbers.cpp
-  ${SOURCES_DIR}/internal/catch_polyfills.cpp
-  ${SOURCES_DIR}/internal/catch_random_number_generator.cpp
-  ${SOURCES_DIR}/internal/catch_random_seed_generation.cpp
-  ${SOURCES_DIR}/internal/catch_registry_hub.cpp
-  ${SOURCES_DIR}/internal/catch_reporter_registry.cpp
-  ${SOURCES_DIR}/internal/catch_reporter_spec_parser.cpp
-  ${SOURCES_DIR}/internal/catch_result_type.cpp
-  ${SOURCES_DIR}/internal/catch_reusable_string_stream.cpp
-  ${SOURCES_DIR}/internal/catch_run_context.cpp
-  ${SOURCES_DIR}/internal/catch_section.cpp
-  ${SOURCES_DIR}/internal/catch_singletons.cpp
-  ${SOURCES_DIR}/internal/catch_source_line_info.cpp
-  ${SOURCES_DIR}/internal/catch_startup_exception_registry.cpp
-  ${SOURCES_DIR}/internal/catch_stdstreams.cpp
-  ${SOURCES_DIR}/internal/catch_string_manip.cpp
-  ${SOURCES_DIR}/internal/catch_stringref.cpp
-  ${SOURCES_DIR}/internal/catch_tag_alias_registry.cpp
-  ${SOURCES_DIR}/internal/catch_test_case_info_hasher.cpp
-  ${SOURCES_DIR}/internal/catch_test_case_registry_impl.cpp
-  ${SOURCES_DIR}/internal/catch_test_case_tracker.cpp
-  ${SOURCES_DIR}/internal/catch_test_failure_exception.cpp
-  ${SOURCES_DIR}/internal/catch_test_registry.cpp
-  ${SOURCES_DIR}/internal/catch_test_spec_parser.cpp
-  ${SOURCES_DIR}/internal/catch_textflow.cpp
-  ${SOURCES_DIR}/internal/catch_uncaught_exceptions.cpp
-  ${SOURCES_DIR}/internal/catch_wildcard_pattern.cpp
-  ${SOURCES_DIR}/internal/catch_xmlwriter.cpp
+    ${SOURCES_DIR}/catch_approx.cpp
+    ${SOURCES_DIR}/internal/catch_assertion_handler.cpp
+    ${SOURCES_DIR}/catch_assertion_result.cpp
+    ${SOURCES_DIR}/internal/catch_clara.cpp
+    ${SOURCES_DIR}/internal/catch_commandline.cpp
+    ${SOURCES_DIR}/internal/catch_source_line_info.cpp
+    ${SOURCES_DIR}/catch_config.cpp
+    ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.cpp
+    ${SOURCES_DIR}/internal/catch_console_colour.cpp
+    ${SOURCES_DIR}/internal/catch_context.cpp
+    ${SOURCES_DIR}/internal/catch_debug_console.cpp
+    ${SOURCES_DIR}/internal/catch_debugger.cpp
+    ${SOURCES_DIR}/internal/catch_enforce.cpp
+    ${SOURCES_DIR}/internal/catch_enum_values_registry.cpp
+    ${SOURCES_DIR}/internal/catch_exception_translator_registry.cpp
+    ${SOURCES_DIR}/internal/catch_fatal_condition_handler.cpp
+    ${SOURCES_DIR}/internal/catch_floating_point_helpers.cpp
+    ${SOURCES_DIR}/internal/catch_istream.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.cpp
+    ${SOURCES_DIR}/internal/catch_list.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_floating_point.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_quantifiers.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_string.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_templated.cpp
+    ${SOURCES_DIR}/catch_message.cpp
+    ${SOURCES_DIR}/internal/catch_output_redirect.cpp
+    ${SOURCES_DIR}/catch_registry_hub.cpp
+    ${SOURCES_DIR}/internal/catch_random_number_generator.cpp
+    ${SOURCES_DIR}/internal/catch_random_seed_generation.cpp
+    ${SOURCES_DIR}/internal/catch_reporter_registry.cpp
+    ${SOURCES_DIR}/internal/catch_reporter_spec_parser.cpp
+    ${SOURCES_DIR}/internal/catch_result_type.cpp
+    ${SOURCES_DIR}/internal/catch_run_context.cpp
+    ${SOURCES_DIR}/internal/catch_section.cpp
+    ${SOURCES_DIR}/internal/catch_stdstreams.cpp
+    ${SOURCES_DIR}/catch_session.cpp
+    ${SOURCES_DIR}/internal/catch_singletons.cpp
+    ${SOURCES_DIR}/internal/catch_reusable_string_stream.cpp
+    ${SOURCES_DIR}/internal/catch_stringref.cpp
+    ${SOURCES_DIR}/internal/catch_string_manip.cpp
+    ${SOURCES_DIR}/internal/catch_tag_alias_registry.cpp
+    ${SOURCES_DIR}/catch_test_case_info.cpp
+    ${SOURCES_DIR}/internal/catch_test_case_registry_impl.cpp
+    ${SOURCES_DIR}/internal/catch_test_case_tracker.cpp
+    ${SOURCES_DIR}/internal/catch_test_registry.cpp
+    ${SOURCES_DIR}/internal/catch_textflow.cpp
+    ${SOURCES_DIR}/catch_test_spec.cpp
+    ${SOURCES_DIR}/internal/catch_test_spec_parser.cpp
+    ${SOURCES_DIR}/catch_timer.cpp
+    ${SOURCES_DIR}/catch_tostring.cpp
+    ${SOURCES_DIR}/catch_totals.cpp
+    ${SOURCES_DIR}/catch_version.cpp
+    ${SOURCES_DIR}/internal/catch_wildcard_pattern.cpp
+    ${SOURCES_DIR}/internal/catch_xmlwriter.cpp
+    ${SOURCES_DIR}/internal/catch_test_case_info_hasher.cpp
+    ${SOURCES_DIR}/generators/catch_generators_random.cpp
+    ${SOURCES_DIR}/generators/catch_generator_exception.cpp
+    ${SOURCES_DIR}/generators/catch_generators.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_container_properties.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_exception.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_predicate.cpp
+    ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.cpp
+    ${SOURCES_DIR}/catch_tag_alias_autoregistrar.cpp
+    ${SOURCES_DIR}/internal/catch_decomposer.cpp
+    ${SOURCES_DIR}/internal/catch_errno_guard.cpp
+    ${SOURCES_DIR}/internal/catch_lazy_expr.cpp
+    ${SOURCES_DIR}/internal/catch_leak_detector.cpp
+    ${SOURCES_DIR}/internal/catch_message_info.cpp
+    ${SOURCES_DIR}/internal/catch_polyfills.cpp
+    ${SOURCES_DIR}/internal/catch_startup_exception_registry.cpp
+    ${SOURCES_DIR}/internal/catch_uncaught_exceptions.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_capture.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_config.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_exception.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_registry.cpp
+    ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.cpp
 )
-set(INTERNAL_FILES ${IMPL_SOURCES} ${IMPL_HEADERS})
-
-set(INTERFACE_HEADERS
-  ${SOURCES_DIR}/interfaces/catch_interfaces_all.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_config.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_exception.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.hpp
-)
-set(INTERFACE_SOURCES
-  ${SOURCES_DIR}/interfaces/catch_interfaces_config.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_exception.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.cpp
-)
-set(INTERFACE_FILES ${INTERFACE_HEADERS} ${INTERFACE_SOURCES})
-
-set(GENERATOR_HEADERS
-  ${SOURCES_DIR}/generators/catch_generator_exception.hpp
-  ${SOURCES_DIR}/generators/catch_generators.hpp
-  ${SOURCES_DIR}/generators/catch_generators_adapters.hpp
-  ${SOURCES_DIR}/generators/catch_generators_all.hpp
-  ${SOURCES_DIR}/generators/catch_generators_random.hpp
-  ${SOURCES_DIR}/generators/catch_generators_range.hpp
-)
-set(GENERATOR_SOURCES
-  ${SOURCES_DIR}/generators/catch_generator_exception.cpp
-  ${SOURCES_DIR}/generators/catch_generators.cpp
-  ${SOURCES_DIR}/generators/catch_generators_random.cpp
-)
-set(GENERATOR_FILES ${GENERATOR_HEADERS} ${GENERATOR_SOURCES})
-
-set(MATCHER_HEADERS
-  ${SOURCES_DIR}/matchers/catch_matchers.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_all.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_container_properties.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_contains.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_range_equals.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_exception.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_floating_point.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_predicate.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_quantifiers.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_string.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_templated.hpp
-  ${SOURCES_DIR}/matchers/catch_matchers_vector.hpp
-  ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.hpp
-)
-set(MATCHER_SOURCES
-  ${SOURCES_DIR}/matchers/catch_matchers.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_container_properties.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_exception.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_floating_point.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_predicate.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_quantifiers.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_string.cpp
-  ${SOURCES_DIR}/matchers/catch_matchers_templated.cpp
-  ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.cpp
-)
-set(MATCHER_FILES ${MATCHER_HEADERS} ${MATCHER_SOURCES})
+set(INTERNAL_FILES ${IMPL_SOURCES} ${INTERNAL_HEADERS})
 
+# Please keep these ordered alphabetically
 set(REPORTER_HEADERS
-  ${SOURCES_DIR}/reporters/catch_reporter_automake.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_common_base.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_compact.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_console.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_event_listener.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_helpers.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_junit.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_multi.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_registrars.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_sonarqube.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_streaming_base.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_tap.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_teamcity.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_xml.hpp
-  ${SOURCES_DIR}/reporters/catch_reporters_all.hpp
+    ${SOURCES_DIR}/reporters/catch_reporters_all.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_automake.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_common_base.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_compact.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_console.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_event_listener.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_helpers.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_junit.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_multi.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_registrars.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_sonarqube.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_streaming_base.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_tap.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_teamcity.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_xml.hpp
 )
 set(REPORTER_SOURCES
-  ${SOURCES_DIR}/reporters/catch_reporter_automake.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_common_base.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_compact.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_console.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_event_listener.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_helpers.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_junit.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_multi.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_registrars.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_sonarqube.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_streaming_base.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_tap.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_teamcity.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_xml.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_automake.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_common_base.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_compact.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_console.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_event_listener.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_helpers.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_junit.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_multi.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_registrars.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_sonarqube.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_streaming_base.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_tap.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_teamcity.cpp
+    ${SOURCES_DIR}/reporters/catch_reporter_xml.cpp
 )
 set(REPORTER_FILES ${REPORTER_HEADERS} ${REPORTER_SOURCES})
 
-set(ALL_FILES
-  ${BENCHMARK_FILES}
-  ${GENERATOR_FILES}
+add_library(Catch2
   ${REPORTER_FILES}
-  ${INTERFACE_FILES}
   ${INTERNAL_FILES}
-  ${MATCHER_FILES}
+  ${BENCHMARK_HEADERS}
+  ${BENCHMARK_SOURCES}
 )
-
-set(FILTERED_FILES ${ALL_FILES})
-list(REMOVE_ITEM FILTERED_FILES "${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp")
-source_group(
-  TREE ${SOURCES_DIR}
-  PREFIX sources
-  FILES ${FILTERED_FILES}
-)
-source_group("generated headers"
-  FILES
-    "${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
-)
-
-add_library(Catch2 ${ALL_FILES})
 add_build_reproducibility_settings(Catch2)
 add_library(Catch2::Catch2 ALIAS Catch2)
 
@@ -338,10 +299,7 @@ if (ANDROID)
     target_link_libraries(Catch2 INTERFACE log)
 endif()
 
-set_target_properties(Catch2 PROPERTIES
-                          DEBUG_POSTFIX "d"
-                                VERSION ${PROJECT_VERSION}
-                              SOVERSION ${PROJECT_VERSION})
+set_target_properties(Catch2 PROPERTIES DEBUG_POSTFIX "d")
 
 # depend on bunch of C++11 and C++14 features to have C++14 enabled by default
 target_compile_features(Catch2
@@ -370,13 +328,13 @@ target_compile_features(Catch2
 
 configure_file(
   "${SOURCES_DIR}/catch_user_config.hpp.in"
-  "${PROJECT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
+  "${CMAKE_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
 )
 
 target_include_directories(Catch2
   PUBLIC
     $<BUILD_INTERFACE:${SOURCES_DIR}/..>
-    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-includes>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-includes>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
@@ -390,8 +348,6 @@ target_link_libraries(Catch2WithMain PUBLIC Catch2)
 set_target_properties(Catch2WithMain
   PROPERTIES
     OUTPUT_NAME "Catch2Main"
-        VERSION ${PROJECT_VERSION}
-      SOVERSION ${PROJECT_VERSION}
 )
 set_target_properties(Catch2WithMain PROPERTIES DEBUG_POSTFIX "d")
 
@@ -403,12 +359,8 @@ if (NOT_SUBPROJECT)
         Catch2WithMain
       EXPORT
         Catch2Targets
-      LIBRARY DESTINATION
+      DESTINATION
         ${CMAKE_INSTALL_LIBDIR}
-      ARCHIVE DESTINATION
-        ${CMAKE_INSTALL_LIBDIR}
-      RUNTIME DESTINATION
-        ${CMAKE_INSTALL_BINDIR}
     )
 
 
@@ -424,7 +376,7 @@ if (NOT_SUBPROJECT)
     install(
       DIRECTORY
         "${SOURCES_DIR}"
-        "${PROJECT_BINARY_DIR}/generated-includes/catch2" # Also install the generated header
+        "${CMAKE_BINARY_DIR}/generated-includes/catch2" # Also install the generated header
       DESTINATION
         "${CMAKE_INSTALL_INCLUDEDIR}"
       FILES_MATCHING
@@ -438,20 +390,19 @@ endif()
 if (CATCH_BUILD_EXAMPLES OR CATCH_BUILD_EXTRA_TESTS)
     add_library(Catch2_buildall_interface INTERFACE)
     target_sources(Catch2_buildall_interface INTERFACE
-      ${ALL_FILES}
+      ${REPORTER_FILES}
+      ${INTERNAL_FILES}
+      ${BENCHMARK_HEADERS}
+      ${BENCHMARK_SOURCES}
       # Also include main entry point
       ${SOURCES_DIR}/internal/catch_main.cpp
     )
     target_include_directories(Catch2_buildall_interface
       INTERFACE
         $<BUILD_INTERFACE:${SOURCES_DIR}/..>
-        $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-includes>
+        $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/generated-includes>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
     )
-    target_compile_definitions(Catch2_buildall_interface
-      INTERFACE
-        CATCH_CONFIG_STATIC
-    )
     target_compile_features(Catch2_buildall_interface
       INTERFACE
         cxx_alignas
@@ -485,10 +436,12 @@ set(CATCH_WARNING_TARGETS ${CATCH_WARNING_TARGETS} PARENT_SCOPE)
 # so we want to check & warn users if they do this. However, we won't abort
 # the configuration step so that we don't have to also provide an override.
 if (BUILD_SHARED_LIBS)
-    set_target_properties(Catch2 Catch2WithMain
-      PROPERTIES
-        WINDOWS_EXPORT_ALL_SYMBOLS ON
-    )
+    if (MSVC)
+        set_target_properties(Catch2 Catch2WithMain
+          PROPERTIES
+            WINDOWS_EXPORT_ALL_SYMBOLS ON
+        )
+    endif()
 
     get_target_property(_VisPreset Catch2 CXX_VISIBILITY_PRESET)
     if (NOT MSVC AND _VisPreset STREQUAL "hidden")

src/catch2/benchmark/catch_benchmark.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -11,11 +11,9 @@
 #define CATCH_BENCHMARK_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_config.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_context.hpp>
-#include <catch2/internal/catch_run_context.hpp>
-#include <catch2/internal/catch_registry_hub.hpp>
+#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/benchmark/catch_chronometer.hpp>
@@ -28,7 +26,6 @@
 #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
 #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
 
-
 #include <algorithm>
 #include <functional>
 #include <string>
@@ -67,7 +64,7 @@ namespace Catch {
                     });
 
                     BenchmarkInfo info {
-                        CATCH_MOVE(name),
+                        name,
                         plan.estimated_duration.count(),
                         plan.iterations_per_sample,
                         cfg->benchmarkSamples(),
@@ -83,7 +80,7 @@ namespace Catch {
                     });
 
                     auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
-                    BenchmarkStats<FloatDuration<Clock>> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
                     getResultCapture().benchmarkEnded(stats);
                 } CATCH_CATCH_ANON (TestFailureException) {
                     getResultCapture().benchmarkFailed("Benchmark failed due to failed assertion"_sr);

src/catch2/benchmark/catch_benchmark_all.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/catch_chronometer.cpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/catch_chronometer.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/catch_clock.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/catch_constructor.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -54,18 +54,14 @@ namespace Catch {
                 template <typename U>
                 void destruct_on_exit(std::enable_if_t<!Destruct, U>* = nullptr) { }
 
-#if defined( __GNUC__ ) && __GNUC__ <= 6
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
-                T& stored_object() { return *reinterpret_cast<T*>( data ); }
+                T& stored_object() {
+                    return *static_cast<T*>(static_cast<void*>(data));
+                }
 
                 T const& stored_object() const {
-                    return *reinterpret_cast<T const*>( data );
+                    return *static_cast<T const*>(static_cast<void const*>(data));
                 }
-#if defined( __GNUC__ ) && __GNUC__ <= 6
-#    pragma GCC diagnostic pop
-#endif
+
 
                 alignas( T ) unsigned char data[sizeof( T )]{};
             };

src/catch2/benchmark/catch_environment.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/catch_estimate.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/catch_execution_plan.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/catch_optimizer.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -10,7 +10,7 @@
 #ifndef CATCH_OPTIMIZER_HPP_INCLUDED
 #define CATCH_OPTIMIZER_HPP_INCLUDED
 
-#if defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
+#if defined(_MSC_VER)
 #   include <atomic> // atomic_thread_fence
 #endif
 
@@ -32,23 +32,16 @@ namespace Catch {
         namespace Detail {
             inline void optimizer_barrier() { keep_memory(); }
         } // namespace Detail
-#elif defined(_MSC_VER) || defined(__IAR_SYSTEMS_ICC__)
+#elif defined(_MSC_VER)
 
-#if defined(_MSVC_VER)
 #pragma optimize("", off)
-#elif defined(__IAR_SYSTEMS_ICC__)
-// For IAR the pragma only affects the following function
-#pragma optimize=disable
-#endif
         template <typename T>
         inline void keep_memory(T* p) {
             // thanks @milleniumbug
             *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
         }
         // TODO equivalent keep_memory()
-#if defined(_MSVC_VER)
 #pragma optimize("", on)
-#endif
 
         namespace Detail {
             inline void optimizer_barrier() {

src/catch2/benchmark/catch_outlier_classification.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/catch_sample_analysis.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_analyse.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_benchmark_function.cpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_benchmark_function.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_complete_invoke.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -12,6 +12,8 @@
 
 #include <catch2/internal/catch_test_failure_exception.hpp>
 #include <catch2/internal/catch_meta.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
+#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
 #include <type_traits>

src/catch2/benchmark/detail/catch_estimate_clock.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_measure.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_repeat.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_run_for_at_least.cpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_run_for_at_least.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_stats.cpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_stats.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/benchmark/detail/catch_timing.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_all.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -27,7 +27,6 @@
 #include <catch2/catch_assertion_info.hpp>
 #include <catch2/catch_assertion_result.hpp>
 #include <catch2/catch_config.hpp>
-#include <catch2/catch_get_random_seed.hpp>
 #include <catch2/catch_message.hpp>
 #include <catch2/catch_section_info.hpp>
 #include <catch2/catch_session.hpp>
@@ -36,7 +35,6 @@
 #include <catch2/catch_template_test_macros.hpp>
 #include <catch2/catch_test_case_info.hpp>
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_test_run_info.hpp>
 #include <catch2/catch_test_spec.hpp>
 #include <catch2/catch_timer.hpp>
 #include <catch2/catch_tostring.hpp>
@@ -47,12 +45,10 @@
 #include <catch2/generators/catch_generators_all.hpp>
 #include <catch2/interfaces/catch_interfaces_all.hpp>
 #include <catch2/internal/catch_assertion_handler.hpp>
-#include <catch2/internal/catch_benchmark_stats_fwd.hpp>
 #include <catch2/internal/catch_case_insensitive_comparisons.hpp>
 #include <catch2/internal/catch_case_sensitive.hpp>
 #include <catch2/internal/catch_clara.hpp>
 #include <catch2/internal/catch_commandline.hpp>
-#include <catch2/internal/catch_compare_traits.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_config_android_logwrite.hpp>
 #include <catch2/internal/catch_config_counter.hpp>
@@ -71,27 +67,22 @@
 #include <catch2/internal/catch_exception_translator_registry.hpp>
 #include <catch2/internal/catch_fatal_condition_handler.hpp>
 #include <catch2/internal/catch_floating_point_helpers.hpp>
-#include <catch2/internal/catch_getenv.hpp>
-#include <catch2/internal/catch_is_permutation.hpp>
 #include <catch2/internal/catch_istream.hpp>
 #include <catch2/internal/catch_lazy_expr.hpp>
 #include <catch2/internal/catch_leak_detector.hpp>
 #include <catch2/internal/catch_list.hpp>
-#include <catch2/internal/catch_logical_traits.hpp>
 #include <catch2/internal/catch_message_info.hpp>
 #include <catch2/internal/catch_meta.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
 #include <catch2/internal/catch_optional.hpp>
 #include <catch2/internal/catch_output_redirect.hpp>
-#include <catch2/internal/catch_parse_numbers.hpp>
 #include <catch2/internal/catch_platform.hpp>
 #include <catch2/internal/catch_polyfills.hpp>
 #include <catch2/internal/catch_preprocessor.hpp>
 #include <catch2/internal/catch_preprocessor_remove_parens.hpp>
 #include <catch2/internal/catch_random_number_generator.hpp>
 #include <catch2/internal/catch_random_seed_generation.hpp>
-#include <catch2/internal/catch_registry_hub.hpp>
 #include <catch2/internal/catch_reporter_registry.hpp>
 #include <catch2/internal/catch_reporter_spec_parser.hpp>
 #include <catch2/internal/catch_result_type.hpp>
@@ -122,6 +113,7 @@
 #include <catch2/internal/catch_unique_ptr.hpp>
 #include <catch2/internal/catch_void_type.hpp>
 #include <catch2/internal/catch_wildcard_pattern.hpp>
+#include <catch2/internal/catch_windows_h_proxy.hpp>
 #include <catch2/internal/catch_xmlwriter.hpp>
 #include <catch2/matchers/catch_matchers_all.hpp>
 #include <catch2/reporters/catch_reporters_all.hpp>

src/catch2/catch_approx.cpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_approx.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_assertion_info.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_assertion_result.cpp

@@ -1,13 +1,12 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/catch_assertion_result.hpp>
 #include <catch2/internal/catch_reusable_string_stream.hpp>
-#include <catch2/internal/catch_move_and_forward.hpp>
 
 namespace Catch {
 
@@ -27,9 +26,9 @@ namespace Catch {
         return reconstructedExpression;
     }
 
-    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData&& data )
+    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
     :   m_info( info ),
-        m_resultData( CATCH_MOVE(data) )
+        m_resultData( data )
     {}
 
     // Result was a success
@@ -68,15 +67,16 @@ namespace Catch {
     }
 
     std::string AssertionResult::getExpressionInMacro() const {
-        if ( m_info.macroName.empty() ) {
-            return static_cast<std::string>( m_info.capturedExpression );
-        }
         std::string expr;
-        expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
-        expr += m_info.macroName;
-        expr += "( ";
-        expr += m_info.capturedExpression;
-        expr += " )";
+        if( m_info.macroName.empty() )
+            expr = static_cast<std::string>(m_info.capturedExpression);
+        else {
+            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
+            expr += m_info.macroName;
+            expr += "( ";
+            expr += m_info.capturedExpression;
+            expr += " )";
+        }
         return expr;
     }
 

src/catch2/catch_assertion_result.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -35,7 +35,7 @@ namespace Catch {
     class AssertionResult {
     public:
         AssertionResult() = delete;
-        AssertionResult( AssertionInfo const& info, AssertionResultData&& data );
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
 
         bool isOk() const;
         bool succeeded() const;

src/catch2/catch_config.cpp

@@ -1,89 +1,42 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/catch_config.hpp>
 #include <catch2/catch_user_config.hpp>
 #include <catch2/internal/catch_enforce.hpp>
-#include <catch2/internal/catch_parse_numbers.hpp>
-#include <catch2/internal/catch_stdstreams.hpp>
 #include <catch2/internal/catch_stringref.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
 #include <catch2/internal/catch_test_spec_parser.hpp>
-#include <catch2/internal/catch_tag_alias_registry.hpp>
-#include <catch2/internal/catch_getenv.hpp>
+#include <catch2/interfaces/catch_interfaces_tag_alias_registry.hpp>
 
-#include <fstream>
+namespace {
+    bool provideBazelReporterOutput() {
+#ifdef CATCH_CONFIG_BAZEL_SUPPORT
+        return true;
+#else
+
+#    if defined( _MSC_VER )
+        // On Windows getenv throws a warning as there is no input validation,
+        // since the switch is hardcoded, this should not be an issue.
+#        pragma warning( push )
+#        pragma warning( disable : 4996 )
+#    endif
+
+        return std::getenv( "BAZEL_TEST" ) != nullptr;
+
+#    if defined( _MSC_VER )
+#        pragma warning( pop )
+#    endif
+#endif
+    }
+}
 
 namespace Catch {
 
-    namespace {
-        static bool enableBazelEnvSupport() {
-#if defined( CATCH_CONFIG_BAZEL_SUPPORT )
-            return true;
-#else
-            return Detail::getEnv( "BAZEL_TEST" ) != nullptr;
-#endif
-        }
-
-        struct bazelShardingOptions {
-            unsigned int shardIndex, shardCount;
-            std::string shardFilePath;
-        };
-
-        static Optional<bazelShardingOptions> readBazelShardingOptions() {
-            const auto bazelShardIndex = Detail::getEnv( "TEST_SHARD_INDEX" );
-            const auto bazelShardTotal = Detail::getEnv( "TEST_TOTAL_SHARDS" );
-            const auto bazelShardInfoFile = Detail::getEnv( "TEST_SHARD_STATUS_FILE" );
-
-
-            const bool has_all =
-                bazelShardIndex && bazelShardTotal && bazelShardInfoFile;
-            if ( !has_all ) {
-                // We provide nice warning message if the input is
-                // misconfigured.
-                auto warn = []( const char* env_var ) {
-                    Catch::cerr()
-                        << "Warning: Bazel shard configuration is missing '"
-                        << env_var << "'. Shard configuration is skipped.\n";
-                };
-                if ( !bazelShardIndex ) {
-                    warn( "TEST_SHARD_INDEX" );
-                }
-                if ( !bazelShardTotal ) {
-                    warn( "TEST_TOTAL_SHARDS" );
-                }
-                if ( !bazelShardInfoFile ) {
-                    warn( "TEST_SHARD_STATUS_FILE" );
-                }
-                return {};
-            }
-
-            auto shardIndex = parseUInt( bazelShardIndex );
-            if ( !shardIndex ) {
-                Catch::cerr()
-                    << "Warning: could not parse 'TEST_SHARD_INDEX' ('" << bazelShardIndex
-                    << "') as unsigned int.\n";
-                return {};
-            }
-            auto shardTotal = parseUInt( bazelShardTotal );
-            if ( !shardTotal ) {
-                Catch::cerr()
-                    << "Warning: could not parse 'TEST_TOTAL_SHARD' ('"
-                    << bazelShardTotal << "') as unsigned int.\n";
-                return {};
-            }
-
-            return bazelShardingOptions{
-                *shardIndex, *shardTotal, bazelShardInfoFile };
-
-        }
-    } // end namespace
-
-
     bool operator==( ProcessedReporterSpec const& lhs,
                      ProcessedReporterSpec const& rhs ) {
         return lhs.name == rhs.name &&
@@ -105,6 +58,17 @@ namespace Catch {
             elem = trim(elem);
         }
 
+
+        TestSpecParser parser(ITagAliasRegistry::get());
+        if (!m_data.testsOrTags.empty()) {
+            m_hasTestFilters = true;
+            for (auto const& testOrTags : m_data.testsOrTags) {
+                parser.parse(testOrTags);
+            }
+        }
+        m_testSpec = parser.testSpec();
+
+
         // Insert the default reporter if user hasn't asked for a specfic one
         if ( m_data.reporterSpecifications.empty() ) {
             m_data.reporterSpecifications.push_back( {
@@ -117,20 +81,27 @@ namespace Catch {
             } );
         }
 
-        if ( enableBazelEnvSupport() ) {
-            readBazelEnvVars();
-        }
-
-        // Bazel support can modify the test specs, so parsing has to happen
-        // after reading Bazel env vars.
-        TestSpecParser parser( TagAliasRegistry::get() );
-        if ( !m_data.testsOrTags.empty() ) {
-            m_hasTestFilters = true;
-            for ( auto const& testOrTags : m_data.testsOrTags ) {
-                parser.parse( testOrTags );
+    if(provideBazelReporterOutput()){
+            // Register a JUnit reporter for Bazel. Bazel sets an environment
+            // variable with the path to XML output. If this file is written to
+            // during test, Bazel will not generate a default XML output.
+            // This allows the XML output file to contain higher level of detail
+            // than what is possible otherwise.
+#    if defined( _MSC_VER )
+            // On Windows getenv throws a warning as there is no input validation,
+            // since the key is hardcoded, this should not be an issue.
+#           pragma warning( push )
+#           pragma warning( disable : 4996 )
+#    endif
+            const auto bazelOutputFilePtr = std::getenv( "XML_OUTPUT_FILE" );
+#    if defined( _MSC_VER )
+#        pragma warning( pop )
+#    endif
+            if ( bazelOutputFilePtr != nullptr ) {
+                m_data.reporterSpecifications.push_back(
+                    { "junit", std::string( bazelOutputFilePtr ), {}, {} } );
             }
-        }
-        m_testSpec = parser.testSpec();
+    }
 
 
         // We now fixup the reporter specs to handle default output spec,
@@ -211,37 +182,4 @@ namespace Catch {
     unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
     std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
 
-    void Config::readBazelEnvVars() {
-        // Register a JUnit reporter for Bazel. Bazel sets an environment
-        // variable with the path to XML output. If this file is written to
-        // during test, Bazel will not generate a default XML output.
-        // This allows the XML output file to contain higher level of detail
-        // than what is possible otherwise.
-        const auto bazelOutputFile = Detail::getEnv( "XML_OUTPUT_FILE" );
-
-        if ( bazelOutputFile ) {
-            m_data.reporterSpecifications.push_back(
-                { "junit", std::string( bazelOutputFile ), {}, {} } );
-        }
-
-        const auto bazelTestSpec = Detail::getEnv( "TESTBRIDGE_TEST_ONLY" );
-        if ( bazelTestSpec ) {
-            // Presumably the test spec from environment should overwrite
-            // the one we got from CLI (if we got any)
-            m_data.testsOrTags.clear();
-            m_data.testsOrTags.push_back( bazelTestSpec );
-        }
-
-        const auto bazelShardOptions = readBazelShardingOptions();
-        if ( bazelShardOptions ) {
-            std::ofstream f( bazelShardOptions->shardFilePath,
-                             std::ios_base::out | std::ios_base::trunc );
-            if ( f.is_open() ) {
-                f << "";
-                m_data.shardIndex = bazelShardOptions->shardIndex;
-                m_data.shardCount = bazelShardOptions->shardCount;
-            }
-        }
-    }
-
 } // end namespace Catch

src/catch2/catch_config.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -140,9 +140,6 @@ namespace Catch {
         std::chrono::milliseconds benchmarkWarmupTime() const override;
 
     private:
-        // Reads Bazel env vars and applies them to the config
-        void readBazelEnvVars();
-
         ConfigData m_data;
         std::vector<ProcessedReporterSpec> m_processedReporterSpecs;
         TestSpec m_testSpec;

src/catch2/catch_get_random_seed.cpp

@@ -1,18 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
-#include <catch2/catch_get_random_seed.hpp>
-
-#include <catch2/internal/catch_context.hpp>
-#include <catch2/catch_config.hpp>
-
-namespace Catch {
-    std::uint32_t getSeed() {
-        return getCurrentContext().getConfig()->rngSeed();
-    }
-}

src/catch2/catch_get_random_seed.hpp

@@ -1,18 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-#ifndef CATCH_GET_RANDOM_SEED_HPP_INCLUDED
-#define CATCH_GET_RANDOM_SEED_HPP_INCLUDED
-
-#include <cstdint>
-
-namespace Catch {
-    //! Returns Catch2's current RNG seed.
-    std::uint32_t getSeed();
-}
-
-#endif // CATCH_GET_RANDOM_SEED_HPP_INCLUDED

src/catch2/catch_message.cpp

@@ -1,15 +1,15 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/catch_message.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
 #include <catch2/internal/catch_uncaught_exceptions.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
-#include <catch2/internal/catch_run_context.hpp>
 
 #include <cassert>
 #include <stack>
@@ -19,8 +19,8 @@ namespace Catch {
     ////////////////////////////////////////////////////////////////////////////
 
 
-    ScopedMessage::ScopedMessage( MessageBuilder&& builder ):
-        m_info( CATCH_MOVE(builder.m_info) ) {
+    ScopedMessage::ScopedMessage( MessageBuilder const& builder ):
+        m_info( builder.m_info ) {
         m_info.message = builder.m_stream.str();
         getResultCapture().pushScopedMessage( m_info );
     }

src/catch2/catch_message.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -12,7 +12,7 @@
 #include <catch2/internal/catch_reusable_string_stream.hpp>
 #include <catch2/internal/catch_stream_end_stop.hpp>
 #include <catch2/internal/catch_message_info.hpp>
-#include <catch2/internal/catch_run_context.hpp>
+#include <catch2/interfaces/catch_interfaces_capture.hpp>
 #include <catch2/catch_tostring.hpp>
 
 #include <string>
@@ -39,10 +39,11 @@ namespace Catch {
                         ResultWas::OfType type ):
             m_info(macroName, lineInfo, type) {}
 
+
         template<typename T>
-        MessageBuilder&& operator << ( T const& value ) && {
+        MessageBuilder& operator << ( T const& value ) {
             m_stream << value;
-            return CATCH_MOVE(*this);
+            return *this;
         }
 
         MessageInfo m_info;
@@ -50,7 +51,7 @@ namespace Catch {
 
     class ScopedMessage {
     public:
-        explicit ScopedMessage( MessageBuilder&& builder );
+        explicit ScopedMessage( MessageBuilder const& builder );
         ScopedMessage( ScopedMessage& duplicate ) = delete;
         ScopedMessage( ScopedMessage&& old ) noexcept;
         ~ScopedMessage();
@@ -61,7 +62,7 @@ namespace Catch {
 
     class Capturer {
         std::vector<MessageInfo> m_messages;
-        RunContext& m_resultCapture = getResultCapture();
+        IResultCapture& m_resultCapture = getResultCapture();
         size_t m_captured = 0;
     public:
         Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
@@ -97,15 +98,12 @@ namespace Catch {
 
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
-    Catch::Capturer varName( macroName##_catch_sr,        \
-                             CATCH_INTERNAL_LINEINFO,     \
-                             Catch::ResultWas::Info,      \
-                             #__VA_ARGS__##_catch_sr );   \
+    Catch::Capturer varName( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
     varName.captureValues( 0, __VA_ARGS__ )
 
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_INFO( macroName, log ) \
-    const Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
 
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \

src/catch2/catch_registry_hub.cpp

@@ -0,0 +1,104 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE_1_0.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
+
+#include <catch2/internal/catch_context.hpp>
+#include <catch2/internal/catch_enforce.hpp>
+#include <catch2/internal/catch_test_case_registry_impl.hpp>
+#include <catch2/internal/catch_reporter_registry.hpp>
+#include <catch2/internal/catch_exception_translator_registry.hpp>
+#include <catch2/internal/catch_tag_alias_registry.hpp>
+#include <catch2/internal/catch_startup_exception_registry.hpp>
+#include <catch2/internal/catch_singletons.hpp>
+#include <catch2/internal/catch_enum_values_registry.hpp>
+#include <catch2/catch_test_case_info.hpp>
+#include <catch2/internal/catch_noncopyable.hpp>
+#include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
+#include <catch2/internal/catch_move_and_forward.hpp>
+
+namespace Catch {
+
+    namespace {
+
+        class RegistryHub : public IRegistryHub,
+                            public IMutableRegistryHub,
+                            private Detail::NonCopyable {
+
+        public: // IRegistryHub
+            RegistryHub() = default;
+            IReporterRegistry const& getReporterRegistry() const override {
+                return m_reporterRegistry;
+            }
+            ITestCaseRegistry const& getTestCaseRegistry() const override {
+                return m_testCaseRegistry;
+            }
+            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
+                return m_exceptionTranslatorRegistry;
+            }
+            ITagAliasRegistry const& getTagAliasRegistry() const override {
+                return m_tagAliasRegistry;
+            }
+            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
+                return m_exceptionRegistry;
+            }
+
+        public: // IMutableRegistryHub
+            void registerReporter( std::string const& name, IReporterFactoryPtr factory ) override {
+                m_reporterRegistry.registerReporter( name, CATCH_MOVE(factory) );
+            }
+            void registerListener( Detail::unique_ptr<EventListenerFactory> factory ) override {
+                m_reporterRegistry.registerListener( CATCH_MOVE(factory) );
+            }
+            void registerTest( Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker ) override {
+                m_testCaseRegistry.registerTest( CATCH_MOVE(testInfo), CATCH_MOVE(invoker) );
+            }
+            void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) override {
+                m_exceptionTranslatorRegistry.registerTranslator( CATCH_MOVE(translator) );
+            }
+            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
+                m_tagAliasRegistry.add( alias, tag, lineInfo );
+            }
+            void registerStartupException() noexcept override {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                m_exceptionRegistry.add(std::current_exception());
+#else
+                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+#endif
+            }
+            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
+                return m_enumValuesRegistry;
+            }
+
+        private:
+            TestRegistry m_testCaseRegistry;
+            ReporterRegistry m_reporterRegistry;
+            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+            TagAliasRegistry m_tagAliasRegistry;
+            StartupExceptionRegistry m_exceptionRegistry;
+            Detail::EnumValuesRegistry m_enumValuesRegistry;
+        };
+    }
+
+    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
+
+    IRegistryHub const& getRegistryHub() {
+        return RegistryHubSingleton::get();
+    }
+    IMutableRegistryHub& getMutableRegistryHub() {
+        return RegistryHubSingleton::getMutable();
+    }
+    void cleanUp() {
+        cleanupSingletons();
+        cleanUpContext();
+    }
+    std::string translateActiveException() {
+        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+    }
+
+
+} // end namespace Catch

src/catch2/catch_section_info.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_session.cpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -19,14 +19,11 @@
 #include <catch2/internal/catch_textflow.hpp>
 #include <catch2/internal/catch_windows_h_proxy.hpp>
 #include <catch2/reporters/catch_reporter_multi.hpp>
-#include <catch2/internal/catch_reporter_registry.hpp>
+#include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_stdstreams.hpp>
 #include <catch2/internal/catch_istream.hpp>
-#include <catch2/internal/catch_test_case_registry_impl.hpp>
-#include <catch2/internal/catch_registry_hub.hpp>
-#include <catch2/catch_test_case_info.hpp>
 
 #include <algorithm>
 #include <cassert>
@@ -64,6 +61,7 @@ namespace Catch {
                 multi->addListener(listener->create(config));
             }
 
+            std::size_t reporterIdx = 0;
             for ( auto const& reporterSpec : config->getProcessedReporterSpecs() ) {
                 multi->addReporter( createReporter(
                     reporterSpec.name,
@@ -71,6 +69,7 @@ namespace Catch {
                                     makeStream( reporterSpec.outputFilename ),
                                     reporterSpec.colourMode,
                                     reporterSpec.customOptions ) ) );
+                reporterIdx++;
             }
 
             return multi;
@@ -344,12 +343,6 @@ namespace Catch {
                 return 2;
             }
 
-            if ( totals.testCases.total() > 0 &&
-                 totals.testCases.total() == totals.testCases.skipped
-                && !m_config->zeroTestsCountAsSuccess() ) {
-                return 4;
-            }
-
             // Note that on unices only the lower 8 bits are usually used, clamping
             // the return value to 255 prevents false negative when some multiple
             // of 256 tests has failed

src/catch2/catch_session.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_tag_alias.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_tag_alias_autoregistrar.cpp

@@ -1,14 +1,14 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
 
 #include <catch2/catch_tag_alias_autoregistrar.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_registry_hub.hpp>
+#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 
 namespace Catch {
 

src/catch2/catch_tag_alias_autoregistrar.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_template_test_macros.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_test_case_info.cpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0

src/catch2/catch_test_case_info.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -15,9 +15,9 @@
 #include <catch2/internal/catch_unique_ptr.hpp>
 
 
-#include <cstdint>
 #include <string>
 #include <vector>
+#include <cstdint>
 
 #ifdef __clang__
 #pragma clang diagnostic push

src/catch2/catch_test_macros.hpp

@@ -1,7 +1,7 @@
 
 //              Copyright Catch2 Authors
 // Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
+//   (See accompanying file LICENSE_1_0.txt or copy at
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
@@ -49,7 +49,6 @@
   #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
   #define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
   #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-  #define CATCH_SKIP( ... ) INTERNAL_CATCH_MSG( "SKIP", Catch::ResultWas::ExplicitSkip, Catch::ResultDisposition::Normal, __VA_ARGS__ )
 
 
   #if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
@@ -103,7 +102,6 @@
   #define CATCH_FAIL( ... ) (void)(0)
   #define CATCH_FAIL_CHECK( ... ) (void)(0)
   #define CATCH_SUCCEED( ... ) (void)(0)
-  #define CATCH_SKIP( ... ) (void)(0)
 
   #define CATCH_STATIC_REQUIRE( ... )       (void)(0)
   #define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
@@ -148,7 +146,6 @@
   #define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
   #define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
   #define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-  #define SKIP( ... ) INTERNAL_CATCH_MSG( "SKIP", Catch::ResultWas::ExplicitSkip, Catch::ResultDisposition::Normal, __VA_ARGS__ )
 
 
   #if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
@@ -201,7 +198,6 @@
   #define FAIL( ... ) (void)(0)
   #define FAIL_CHECK( ... ) (void)(0)
   #define SUCCEED( ... ) (void)(0)
-  #define SKIP( ... ) (void)(0)
 
   #define STATIC_REQUIRE( ... )       (void)(0)
   #define STATIC_REQUIRE_FALSE( ... ) (void)(0)

src/catch2/catch_test_run_info.hpp

@@ -1,23 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-#ifndef CATCH_TEST_RUN_INFO_HPP_INCLUDED
-#define CATCH_TEST_RUN_INFO_HPP_INCLUDED
-
-#include <catch2/internal/catch_stringref.hpp>
-
-namespace Catch {
-
-    struct TestRunInfo {
-        constexpr TestRunInfo(StringRef _name) : name(_name) {}
-        StringRef name;
-    };
-
-
-} // end namespace Catch
-
-#endif // CATCH_TEST_RUN_INFO_HPP_INCLUDED