Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdf73fa..9fea965 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,9 +30,6 @@ set(CMAKE_RELWITHDEBINFO_POSTFIX reldbg)
# Add main tcp_pubsub library
add_subdirectory(tcp_pubsub)

-# Recycle dependency. It's header only and not in the API, so we add it with EXCLUDE_FOR_ALL, so it won't be installed
-add_subdirectory(thirdparty/recycle EXCLUDE_FROM_ALL)
-
# Generic samples
if (TCP_PUBSUB_BUILD_SAMPLES)
add_subdirectory(samples/performance_publisher)
From 23277e275fe3b255a2d8ff40ef501e7b95047a6f Mon Sep 17 00:00:00 2001
From: Adrien Bourdeaux <bourdeaux.adrien@gmail.com>
Date: Mon, 14 Apr 2025 11:35:20 -0400
Subject: [PATCH] fix-deps

---
tcp_pubsub/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tcp_pubsub/CMakeLists.txt b/tcp_pubsub/CMakeLists.txt
index d2a5777..772319a 100644
index 2ef4582..0f8cc58 100644
--- a/tcp_pubsub/CMakeLists.txt
+++ b/tcp_pubsub/CMakeLists.txt
@@ -10,8 +10,8 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
Expand All @@ -35,16 +30,14 @@ index d2a5777..772319a 100644
)

target_compile_definitions(${PROJECT_NAME}
@@ -100,6 +99,7 @@ target_include_directories(${PROJECT_NAME}
$<INSTALL_INTERFACE:include>
PRIVATE
src/
+ ${RECYCLE_INCLUDE_DIRS}
@@ -81,6 +80,7 @@ target_compile_definitions(${PROJECT_NAME}
ASIO_STANDALONE
ASIO_DISABLE_VISIBILITY
_WIN32_WINNT=0x0601
+ ${RECYCLE_INCLUDE_DIRS}
)

set_target_properties(${PROJECT_NAME} PROPERTIES
@@ -177,4 +177,3 @@ install(
DESTINATION ${TCP_PUBSUB_INSTALL_CMAKE_DIR}
COMPONENT tcp_pubsub_dev
)
-
# Check if tcp_pubsub is an object library. If so, define TCP_PUBSUB_STATIC_DEFINE,
--
2.47.1.windows.2

13 changes: 0 additions & 13 deletions ports/tcp-pubsub/fix-package-config-file.patch

This file was deleted.

7 changes: 4 additions & 3 deletions ports/tcp-pubsub/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO eclipse-ecal/tcp_pubsub
REF "v${VERSION}"
SHA512 f89b9d9cdbd8e5787ac8923ec65cc2fc259e7d12269b1466a4c29657d8d466e39b95ec8b8483e975bf393f71b5c2d8f59cfd3d955e4e72d69716ec59fe0429af
SHA512 f8dfe5d506449c641fdb1876cbee144ca72a96fc829f2294c51a46ed2b3b0987356b36356ce43d44360ee36546f9e2af584631ddc851b89c9e9a22ced6d55f74
PATCHES
"fix-package-config-file.patch"
"use-ports-for-asio-and-recycle.patch"
fix-finding-asio-recycle-deps.patch
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DTCP_PUBSUB_BUILD_SAMPLES=OFF
-DTCP_PUBSUB_BUILD_ECAL_SAMPLES=OFF
-DTCP_PUBSUB_USE_BUILTIN_RECYCLE=OFF # A bit confusing, this means to use recycle that is installed on the system
-DTCP_PUBSUB_USE_BUILTIN_ASIO=OFF # A bit confusing, this means to use asio that is installed on the system
)

vcpkg_cmake_install()
Expand Down
3 changes: 2 additions & 1 deletion ports/tcp-pubsub/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "tcp-pubsub",
"version": "1.0.3",
"version": "2.0.1",
"description": "TCP based publish-subscribe library for C++",
"homepage": "https://github.com/eclipse-ecal/tcp_pubsub",
"license": "MIT",
"supports": "!uwp",
"dependencies": [
"asio",
"pthreads",
"recycle",
{
"name": "vcpkg-cmake",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -9169,7 +9169,7 @@
"port-version": 0
},
"tcp-pubsub": {
"baseline": "1.0.3",
"baseline": "2.0.1",
"port-version": 0
},
"tdscpp": {
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tcp-pubsub.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6631bc62241e7af5a5668d51803c35dcbde73e53",
"version": "2.0.1",
"port-version": 0
},
{
"git-tree": "075f0da2c8e03d545d28b625ecadde2a58135382",
"version": "1.0.3",
Expand Down
Loading