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 3.1.1 #27282

Merged
merged 2 commits into from
Oct 19, 2022
Merged

[catch2] Update to 3.1.1 #27282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76b301a
[catch2] Update to 3.1.1
RT2Code Oct 17, 2022
0c5d172
[catch2] Update version files
RT2Code Oct 17, 2022
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
15 changes: 7 additions & 8 deletions ports/catch2/fix-install-path.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,7 +170,7 @@
@@ -164,7 +164,7 @@

## Provide some pkg-config integration
set(PKGCONFIG_INSTALL_DIR
Expand All @@ -13,20 +13,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -356,12 +356,28 @@
@@ -363,16 +363,28 @@
install(
TARGETS
Catch2
- Catch2WithMain
EXPORT
Catch2Targets
- DESTINATION
+ LIBRARY DESTINATION
LIBRARY DESTINATION
${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION
+ ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION
+ ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION
${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION
${CMAKE_INSTALL_BINDIR}
)
+
+ install(
Expand Down
34 changes: 0 additions & 34 deletions ports/catch2/fix-uwp-build.patch
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions ports/catch2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@

if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
endif()

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO catchorg/Catch2
REF v3.1.0
SHA512 49e5339263190a6ef15284ef2dcc9e727ce0659cb750d4078024ccf6c6f339740a3a662273718ea73adfbc5928c3ef7268175ebda5ee9ec97ca58fed98747b44
REF v3.1.1
SHA512 d056c8bad8407364debff9f626c7f8255eb64e0faf6dc7fba3d7e14ed29a7e59bd45d92d7b3819bb67d6299a2024f5949c755995d98e94c9bb3d2013709e57ef
HEAD_REF devel
PATCHES
fix-install-path.patch
fix-uwp-build.patch
)

vcpkg_cmake_configure(
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": "3.1.0",
"port-version": 1,
"version-semver": "3.1.1",
"description": "A modern, header-only test framework for unit testing.",
"homepage": "https://github.com/catchorg/Catch2",
"license": "BSL-1.0",
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 @@ -1313,8 +1313,8 @@
"port-version": 1
},
"catch2": {
"baseline": "3.1.0",
"port-version": 1
"baseline": "3.1.1",
"port-version": 0
},
"cccapstone": {
"baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e",
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": "44a94453e68878bf44df00e51bae5115dff3baa8",
"version-semver": "3.1.1",
"port-version": 0
},
{
"git-tree": "286e5ac6cd8702b9b6cf6f486c35cc2516c7950b",
"version-semver": "3.1.0",
Expand Down