[catch2] Update to version 2.13.7 (#19376)

* update version to 2.13.7

* fixup deprecated functions

* apply cmake quoting guidelines

* update baseline

* remove unneeded quotes

* update baseline

* update baseline

* restore versions from master

* add new versions
This commit is contained in:
Ryan 2021-08-12 23:37:35 -07:00 committed by GitHub
parent c801072693
commit 7bdf2f8e85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 10 deletions

View File

@ -1,16 +1,16 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO catchorg/Catch2
REF 5c88067bd339465513af4aec606bd2292f1b594a # v2.13.6
SHA512 62ab120ef9cbbcf7320a96654bda60c766dbbcc0d9cbb2b0b36dd04e828315b627caf51e390dcea915efa266655fe0f28058b972c0d6e0e3e457c565d26e1fd3
REF v2.13.7
SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed
HEAD_REF master
PATCHES fix-install-path.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
-DCATCH_BUILD_EXAMPLES=OFF
@ -24,8 +24,7 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/sha
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_")
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2")
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2)
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Catch2")
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

View File

@ -1,7 +1,6 @@
{
"name": "catch2",
"version-semver": "2.13.6",
"port-version": 2,
"version-semver": "2.13.7",
"description": "A modern, header-only test framework for unit testing.",
"homepage": "https://github.com/catchorg/Catch2",
"dependencies": [

View File

@ -1157,8 +1157,8 @@
"port-version": 0
},
"catch2": {
"baseline": "2.13.6",
"port-version": 2
"baseline": "2.13.7",
"port-version": 0
},
"cccapstone": {
"baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "900833643e0eb468d957b4c46f46ba6647e283ff",
"version-semver": "2.13.7",
"port-version": 0
},
{
"git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25",
"version-semver": "2.13.6",