diff options
| author | Ryan <ryan__mckenzie@hotmail.com> | 2021-08-12 23:37:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-12 23:37:35 -0700 |
| commit | 7bdf2f8e853a476f96f3d1ba3be409b65822a29d (patch) | |
| tree | 7d14b42894f3c9e6777c271c63993852451dde1e | |
| parent | c801072693edcd0704d187131d9078fcd089dbf2 (diff) | |
| download | vcpkg-7bdf2f8e853a476f96f3d1ba3be409b65822a29d.tar.gz vcpkg-7bdf2f8e853a476f96f3d1ba3be409b65822a29d.zip | |
[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
| -rw-r--r-- | ports/catch2/portfile.cmake | 11 | ||||
| -rw-r--r-- | ports/catch2/vcpkg.json | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/c-/catch2.json | 5 |
4 files changed, 13 insertions, 10 deletions
diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index fcc6ab942..b157b48cd 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -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") diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index 0b81964b4..dc2af5075 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -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": [ diff --git a/versions/baseline.json b/versions/baseline.json index e135641ae..95076c3d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 646d520aa..5986f9ef0 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "900833643e0eb468d957b4c46f46ba6647e283ff", + "version-semver": "2.13.7", + "port-version": 0 + }, + { "git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25", "version-semver": "2.13.6", "port-version": 2 |