[catch2] update to 3.6.0 (#38586)

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [ ] The "supports" clause reflects platforms that may be fixed by this
new version.
- [ ] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
This commit is contained in:
miyanyan 2024-05-07 03:42:40 +08:00 committed by GitHub
parent e02de06011
commit 63cc705ef0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 19 deletions

View File

@ -1,15 +0,0 @@
diff --git a/src/catch2/internal/catch_random_integer_helpers.hpp b/src/catch2/internal/catch_random_integer_helpers.hpp
--- a/src/catch2/internal/catch_random_integer_helpers.hpp
+++ b/src/catch2/internal/catch_random_integer_helpers.hpp
@@ -21,7 +21,10 @@
// it, and it provides an escape hatch to the users who need it.
#if defined( __SIZEOF_INT128__ )
# define CATCH_CONFIG_INTERNAL_UINT128
-#elif defined( _MSC_VER ) && ( defined( _WIN64 ) || defined( _M_ARM64 ) )
+// Unlike GCC, MSVC does not polyfill umul as mulh + mul pair on ARM machines.
+// Currently we do not bother doing this ourselves, but we could if it became
+// important for perf.
+#elif defined( _MSC_VER ) && defined( _WIN64 ) && !defined( _M_ARM64 )
# define CATCH_CONFIG_INTERNAL_MSVC_UMUL128
#endif

View File

@ -6,11 +6,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO catchorg/Catch2
REF v${VERSION}
SHA512 c22ad6a2fbf8665b8775d72dcdc6bfde324eb224fcd897ebce5e62c7ac7640823550198fff45e1ea548a5923db4392ce7009ff784ef78bd59356a2aae5337976
SHA512 09c728a04d69b0692d6e2f7ceb5889dc69309406c27f7f2b5d383245a5357657c5540dd64a7a4a6e19388bda68105002425286468578b69b20e3a75366871ce2
HEAD_REF devel
PATCHES
fix-install-path.patch
fix-arm-build.patch
)
vcpkg_cmake_configure(

View File

@ -1,6 +1,6 @@
{
"name": "catch2",
"version-semver": "3.5.4",
"version-semver": "3.6.0",
"description": "A modern, C++-native, test framework for unit-tests, TDD and BDD.",
"homepage": "https://github.com/catchorg/Catch2",
"license": "BSL-1.0",

View File

@ -1497,7 +1497,7 @@
"port-version": 2
},
"catch2": {
"baseline": "3.5.4",
"baseline": "3.6.0",
"port-version": 0
},
"cblas": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f61acaeefdf6127fa878f7192fc109fa8e1a0135",
"version-semver": "3.6.0",
"port-version": 0
},
{
"git-tree": "79536429a52319190e793f8ec7c19c6142b26bd4",
"version-semver": "3.5.4",