Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[catch2] Update to version 2.13.7 #19376

Merged
merged 9 commits into from
Aug 13, 2021
Merged

[catch2] Update to version 2.13.7 #19376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
68e0f19
update version to 2.13.7
Ryan-rsm-McKenzie Aug 5, 2021
4ab278e
fixup deprecated functions
Ryan-rsm-McKenzie Aug 5, 2021
c5358d3
apply cmake quoting guidelines
Ryan-rsm-McKenzie Aug 5, 2021
63eb347
update baseline
Ryan-rsm-McKenzie Aug 5, 2021
74b5874
remove unneeded quotes
Ryan-rsm-McKenzie Aug 6, 2021
0744809
update baseline
Ryan-rsm-McKenzie Aug 6, 2021
19c1ee2
update baseline
Ryan-rsm-McKenzie Aug 13, 2021
3e911f2
restore versions from master
Ryan-rsm-McKenzie Aug 13, 2021
8b27e05
add new versions
Ryan-rsm-McKenzie Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ports/catch2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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")
Expand Down
3 changes: 1 addition & 2 deletions ports/catch2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/catch2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "900833643e0eb468d957b4c46f46ba6647e283ff",
"version-semver": "2.13.7",
"port-version": 0
},
{
"git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25",
"version-semver": "2.13.6",
Expand Down