Update external import

external_imported/Catch2/.bazelrc

@@ -8,3 +8,4 @@ build:vs2022 --cxxopt=/std:c++17
 
 build:windows --config=vs2022
 build:linux --config=gcc11
+build:macos --cxxopt=-std=c++2b

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

@@ -11,7 +11,7 @@ jobs:
  compilation_mode: [fastbuild, dbg, opt]
 
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  - name: Mount bazel cache
  uses: actions/cache@v3

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

@@ -18,10 +18,12 @@ jobs:
  other_pkgs: clang-11
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
 
  - name: Prepare environment
- run: sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}
 
  - name: Configure build
  env:

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

@@ -29,27 +29,27 @@ jobs:
  build_type: Debug
  std: 14
  other_pkgs: g++-7
- cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+ cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
  - cxx: g++-7
  build_description: Extras + Examples
  build_type: Release
  std: 14
  other_pkgs: g++-7
- cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+ cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
 
  # Extras and examples with Clang-10
  - cxx: clang++-10
  build_description: Extras + Examples
  build_type: Debug
  std: 17
  other_pkgs: clang-10
- cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+ cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
  - cxx: clang++-10
  build_description: Extras + Examples
  build_type: Release
  std: 17
  other_pkgs: clang-10
- cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
+ cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
 
  # Configure tests with Clang-10
  - cxx: clang++-10
@@ -70,10 +70,12 @@ jobs:
 
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
 
  - name: Prepare environment
- run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
 
  - name: Configure build
  working-directory: ${{runner.workspace}}

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

@@ -83,7 +83,7 @@ jobs:
  other_pkgs: g++-10
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
 
  - name: Add repositories for older GCC
  run: |
@@ -92,7 +92,9 @@ jobs:
  if: ${{ matrix.cxx == 'g++-5' || matrix.cxx == 'g++-6' }}
 
  - name: Prepare environment
- run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
 
  - name: Configure build
  working-directory: ${{runner.workspace}}

external_imported/Catch2/.github/workflows/mac-builds.yml

@@ -22,7 +22,7 @@ jobs:
  extra_tests: ON
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
 
  - name: Configure build
  working-directory: ${{runner.workspace}}
@@ -42,11 +42,10 @@ jobs:
 
  - name: Build tests + lib
  working-directory: ${{runner.workspace}}/build
- run: make -j 2
+ run: make -j `sysctl -n hw.ncpu`
 
  - name: Run tests
  env:
  CTEST_OUTPUT_ON_FAILURE: 1
  working-directory: ${{runner.workspace}}/build
- # Hardcode 2 cores we know are there
- run: ctest -C ${{matrix.build_type}} -j 2
+ run: ctest -C ${{matrix.build_type}} -j `sysctl -n hw.ncpu`

external_imported/Catch2/.github/workflows/validate-header-guards.yml

@@ -9,7 +9,7 @@ jobs:
  steps:
 
  - name: Checkout source code
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
 
  - name: Setup Dependencies
  uses: actions/setup-python@v2

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

@@ -13,7 +13,7 @@ jobs:
  build_type: [Debug, Release]
  std: [14, 17]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
 
  - name: Configure build
  working-directory: ${{runner.workspace}}

external_imported/Catch2/BUILD.bazel

@@ -43,12 +43,15 @@ expand_template(
  "#cmakedefine CATCH_CONFIG_NO_GLOBAL_NEXTAFTER": "",
  "#cmakedefine CATCH_CONFIG_NO_POSIX_SIGNALS": "",
  "#cmakedefine CATCH_CONFIG_NO_USE_ASYNC": "",
+ "#cmakedefine CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT": "",
  "#cmakedefine CATCH_CONFIG_NO_WCHAR": "",
  "#cmakedefine CATCH_CONFIG_NO_WINDOWS_SEH": "",
  "#cmakedefine CATCH_CONFIG_NOSTDOUT": "",
  "#cmakedefine CATCH_CONFIG_POSIX_SIGNALS": "",
  "#cmakedefine CATCH_CONFIG_PREFIX_ALL": "",
+ "#cmakedefine CATCH_CONFIG_PREFIX_MESSAGES": "",
  "#cmakedefine CATCH_CONFIG_SHARED_LIBRARY": "",
+ "#cmakedefine CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT": "",
  "#cmakedefine CATCH_CONFIG_USE_ASYNC": "",
  "#cmakedefine CATCH_CONFIG_WCHAR": "",
  "#cmakedefine CATCH_CONFIG_WINDOWS_CRTDBG": "",

external_imported/Catch2/CMake/CatchConfigOptions.cmake

@@ -18,10 +18,12 @@
 macro(AddOverridableConfigOption OptionBaseName)
  option(CATCH_CONFIG_${OptionBaseName} "Read docs/configuration.md for details" OFF)
  option(CATCH_CONFIG_NO_${OptionBaseName} "Read docs/configuration.md for details" OFF)
+ mark_as_advanced(CATCH_CONFIG_${OptionBaseName} CATCH_CONFIG_NO_${OptionBaseName})
 endmacro()
 
 macro(AddConfigOption OptionBaseName)
  option(CATCH_CONFIG_${OptionBaseName} "Read docs/configuration.md for details" OFF)
+ mark_as_advanced(CATCH_CONFIG_${OptionBaseName})
 endmacro()
 
 set(_OverridableOptions
@@ -41,6 +43,7 @@ set(_OverridableOptions
  "WCHAR"
  "WINDOWS_SEH"
  "GETENV"
+ "EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT"
 )
 
 foreach(OptionName ${_OverridableOptions})
@@ -61,18 +64,25 @@ set(_OtherConfigOptions
  "FAST_COMPILE"
  "NOSTDOUT"
  "PREFIX_ALL"
+ "PREFIX_MESSAGES"
  "WINDOWS_CRTDBG"
 )
 
 
 foreach(OptionName ${_OtherConfigOptions})
  AddConfigOption(${OptionName})
 endforeach()
-set(CATCH_CONFIG_SHARED_LIBRARY ${BUILD_SHARED_LIBS})
+if(DEFINED BUILD_SHARED_LIBS)
+ set(CATCH_CONFIG_SHARED_LIBRARY ${BUILD_SHARED_LIBS})
+else()
+ set(CATCH_CONFIG_SHARED_LIBRARY "")
+endif()
 
 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.")
 
+mark_as_advanced(CATCH_CONFIG_SHARED_LIBRARY CATCH_CONFIG_DEFAULT_REPORTER CATCH_CONFIG_CONSOLE_WIDTH)
+
 # There is no good way to both turn this into a CMake cache variable,
 # and keep reasonable default semantics inside the project. Thus we do
 # not define it and users have to provide it as an outside variable.

external_imported/Catch2/CMake/CatchMiscFunctions.cmake

@@ -46,7 +46,6 @@ function(add_warnings_to_targets targets)
  set(CHECKED_WARNING_FLAGS
  "-Wabsolute-value"
  "-Wall"
- "-Wc++20-compat"
  "-Wcall-to-pure-virtual-from-ctor-dtor"
  "-Wcast-align"
  "-Wcatch-value"
@@ -74,16 +73,18 @@ function(add_warnings_to_targets targets)
  "-Woverloaded-virtual"
  "-Wparentheses"
  "-Wpedantic"
+ "-Wredundant-decls"
  "-Wreorder"
  "-Wreturn-std-move"
  "-Wshadow"
  "-Wstrict-aliasing"
+ "-Wsubobject-linkage"
  "-Wsuggest-destructor-override"
  "-Wsuggest-override"
  "-Wundef"
  "-Wuninitialized"
  "-Wunneeded-internal-declaration"
- "-Wunreachable-code"
+ "-Wunreachable-code-aggressive"
  "-Wunused"
  "-Wunused-function"
  "-Wunused-parameter"

external_imported/Catch2/CMakeLists.txt

@@ -11,6 +11,7 @@ endif()
 option(CATCH_INSTALL_DOCS "Install documentation alongside library" ON)
 option(CATCH_INSTALL_EXTRAS "Install extras (CMake scripts, debugger helpers) alongside library" ON)
 option(CATCH_DEVELOPMENT_BUILD "Build tests, enable warnings, enable Werror, etc" OFF)
+option(CATCH_ENABLE_REPRODUCIBLE_BUILD "Add compiler flags for improving build reproducibility" ON)
 
 include(CMakeDependentOption)
 cmake_dependent_option(CATCH_BUILD_TESTING "Build the SelfTest project" ON "CATCH_DEVELOPMENT_BUILD" OFF)
@@ -21,6 +22,7 @@ cmake_dependent_option(CATCH_ENABLE_COVERAGE "Generate coverage for codecov.io"
 cmake_dependent_option(CATCH_ENABLE_WERROR "Enables Werror during build" ON "CATCH_DEVELOPMENT_BUILD" OFF)
 cmake_dependent_option(CATCH_BUILD_SURROGATES "Enable generating and building surrogate TUs for the main headers" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
 cmake_dependent_option(CATCH_ENABLE_CONFIGURE_TESTS "Enable CMake configuration tests. WARNING: VERY EXPENSIVE" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
+cmake_dependent_option(CATCH_ENABLE_CMAKE_HELPER_TESTS "Enable CMake helper tests. WARNING: VERY EXPENSIVE" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
 
 
 # Catch2's build breaks if done in-tree. You probably should not build
@@ -31,7 +33,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 endif()
 
 project(Catch2
- VERSION 3.3.2 # CML version placeholder, don't delete
+ VERSION 3.5.2 # 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,6 +150,8 @@ if (NOT_SUBPROJECT)
  "extras/ParseAndAddCatchTests.cmake"
  "extras/Catch.cmake"
  "extras/CatchAddTests.cmake"
+ "extras/CatchShardTests.cmake"
+ "extras/CatchShardTestsImpl.cmake"
  DESTINATION
  ${CATCH_CMAKE_CONFIG_DESTINATION}
  )

external_imported/Catch2/CMakePresets.json

@@ -18,7 +18,8 @@
  "CATCH_BUILD_EXAMPLES": "ON",
  "CATCH_BUILD_EXTRA_TESTS": "ON",
  "CATCH_BUILD_SURROGATES": "ON",
- "CATCH_ENABLE_CONFIGURE_TESTS": "ON"
+ "CATCH_ENABLE_CONFIGURE_TESTS": "ON",
+ "CATCH_ENABLE_CMAKE_HELPER_TESTS": "ON"
  }
  }
  ]