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

Jump to bottom

[rmqcpp] Update to latest revision #40101

Merged
merged 8 commits into from
Sep 8, 2024
Merged

[rmqcpp] Update to latest revision #40101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
50a5175
[rmqcpp] Update to latest revision — Fixes #38736
SirWrexes Jul 26, 2024
dc8a58d
[rmqcpp] Update version metadata to add 1.0.0#1
SirWrexes Jul 26, 2024
2565863
[rmqcpp] Remove `host: true` on dependencie where it doesn't make sense
SirWrexes Jul 28, 2024
a80fce0
[rmqcpp] Update baseline `git-tree`
SirWrexes Jul 28, 2024
36e9884
[rmqcpp] Add patch to skip building examples and tests
SirWrexes Aug 8, 2024
5293891
[rmqcpp] Update baseline and versions file
SirWrexes Aug 9, 2024
46315b4
revert and add port-verison
FrankXie05 Sep 4, 2024
6a6a0be
update version
FrankXie05 Sep 4, 2024
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
22 changes: 22 additions & 0 deletions ports/rmqcpp/disable-tests-and-examples.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33db7ca..41ffd06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,6 @@ enable_testing()
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

add_subdirectory(src)
-add_subdirectory(examples)

if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
add_compile_options(-Wall -Wextra -Wpedantic)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f051820..2db9e2a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,5 +9,3 @@ find_package(GTest REQUIRED)
find_package(bal REQUIRED)

add_subdirectory(rmq)
-add_subdirectory(rmqtestmocks)
-add_subdirectory(tests)
6 changes: 4 additions & 2 deletions ports/rmqcpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO bloomberg/rmqcpp
REF 52e583c2eb3f06707ce5fde7f29089b17428f6b2
SHA512 c4232f37e7bc61d0cc77c52a1283fefc1a7925b4ef8cfbe9b404393540c773feabdc2ad3adc263beb06fe079cbf22010bf1551e15eb2f55b1347f6d8c8f35f8b
REF 11859eb470f31008da522b59e96899585b4e94ce
FrankXie05 marked this conversation as resolved.
Show resolved Hide resolved
SHA512 f82cc1696d370e81dc410442465ecbe06940cd50ae8c93215e19a4b7de57ee7581a1d4f59d9775e08c646b63496ac18528b29edb852e0b9fb9cab7f761151b25
HEAD_REF main
PATCHES
"disable-tests-and-examples.patch"
)

vcpkg_cmake_configure(
Expand Down
22 changes: 5 additions & 17 deletions ports/rmqcpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,17 @@
{
"name": "rmqcpp",
"version": "1.0.0",
"port-version": 1,
"description": "rmqcpp - A C++ library for RabbitMQ.",
"dependencies": [
{
"name": "bde",
"host": true,
"version>=": "3.123.0.0"
},
{
"name": "boost-asio",
"host": true
},
{
"name": "boost-iostreams",
"host": true
},
{
"name": "gtest",
"host": true
},
{
"name": "openssl",
"host": true
},
"boost-asio",
"boost-iostreams",
"gtest",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Despite only being needed for tests, gtest is set as a non-host dependency since there is no way to disable tests in the port for now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test dirs are removed from the build. What is left?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you try building the port without this dependency? the patch above that deletes add_subdirectory(tests) from CMakeLists.txt should make it so that this dependency is no longer needed.

"openssl",
{
"name": "vcpkg-cmake",
"host": true
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7830,7 +7830,7 @@
},
"rmqcpp": {
"baseline": "1.0.0",
"port-version": 0
"port-version": 1
},
"roaring": {
"baseline": "4.0.0",
Expand Down
19 changes: 12 additions & 7 deletions versions/r-/rmqcpp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{
"versions": [
{
"version": "1.0.0",
"port-version": 0,
"git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602"
}
]
"versions": [
{
"git-tree": "5671a6b2d1b566222dbe12642e6e4fd86c9cc7f5",
"version": "1.0.0",
"port-version": 1
},
FrankXie05 marked this conversation as resolved.
Show resolved Hide resolved
{
"git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602",
"version": "1.0.0",
"port-version": 0
}
]
}
Loading