[fastdds] Fix dependencies (#45568)

This commit is contained in:
Thomas1664
2025-05-19 22:33:09 +02:00
committed by GitHub
parent 9589967d22
commit d9ccd77bb5
6 changed files with 50 additions and 18 deletions

View File

@@ -0,0 +1,39 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2ea15f4c..8996d18f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,8 +255,8 @@ if(NOT BUILD_SHARED_LIBS)
endif()
eprosima_find_package(fastcdr 2 REQUIRED)
-eprosima_find_thirdparty(Asio asio VERSION 1.10.8)
-eprosima_find_thirdparty(TinyXML2 tinyxml2)
+find_package(asio CONFIG REQUIRED)
+find_package(tinyxml2 CONFIG REQUIRED)
find_package(foonathan_memory REQUIRED)
message(STATUS "Found foonathan_memory: ${foonathan_memory_DIR}")
@@ -268,7 +268,7 @@ if(ANDROID)
endif()
endif()
-include_directories(thirdparty/nlohmann-json)
+find_package(nlohmann_json CONFIG REQUIRED)
include_directories(thirdparty/filewatch)
###############################################################################
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index 44a74948c..09330717b 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -505,8 +505,9 @@ target_link_libraries(${PROJECT_NAME}
${PRIVACY}
fastcdr
foonathan_memory
+ nlohmann_json::nlohmann_json
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}
- ${TINYXML2_LIBRARY}
+ tinyxml2::tinyxml2
$<$<BOOL:${LINK_SSL}>:OpenSSL::SSL$<SEMICOLON>OpenSSL::Crypto$<$<BOOL:${WIN32}>:$<SEMICOLON>crypt32.lib>>
$<$<BOOL:${WIN32}>:iphlpapi$<SEMICOLON>Shlwapi>
${THIRDPARTY_BOOST_LINK_LIBS}

View File

@@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c930e31..11b96a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,7 +255,7 @@ if(NOT BUILD_SHARED_LIBS)
endif()
eprosima_find_package(fastcdr 2 REQUIRED)
-eprosima_find_thirdparty(Asio asio VERSION 1.10.8)
+find_package(asio CONFIG REQUIRED)
eprosima_find_thirdparty(TinyXML2 tinyxml2)
find_package(foonathan_memory REQUIRED)

View File

@@ -1,4 +1,3 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO eProsima/Fast-DDS
@@ -6,7 +5,7 @@ vcpkg_from_github(
SHA512 ddef07c182d5d0b6096c8714595775d13fbbf9bedcd7e296c38f5b8ce0488d89b7a0048741143dbffbb9c21c3707b1084d1cd80ae7d019c0cac90e0f5eba5519
HEAD_REF master
PATCHES
fix-find-package-asio.patch
fix-deps.patch
pdb-file.patch
disable-werror.patch
include-cstdint.patch
@@ -24,6 +23,7 @@ endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DSECURITY=ON
-DFORCE_CXX=14 # foonathan memory debug needs C++14 constexpr
${extra_opts}
)
@@ -74,7 +74,7 @@ elseif(VCPKG_TARGET_IS_LINUX)
endif()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/fastdds/discovery/parser.py" "tool_path / '../../../bin'" "tool_path / '../../${PORT}'")
if( VCPKG_BUILD_TYPE STREQUAL "debug")
if(NOT VCPKG_BUILD_TYPE)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fastdds/fast-discovery-server-targets-debug.cmake" [[${_IMPORT_PREFIX}/tools/fastdds/fast-discovery-serverd-1.0.1]] [[${_IMPORT_PREFIX}/tools/fastdds/fast-discovery-server-1.0.1]])
endif()

View File

@@ -1,7 +1,7 @@
{
"name": "fastdds",
"version": "3.2.2",
"port-version": 1,
"port-version": 2,
"description": "eprosima Fast DDS (formerly Fast RTPS) is a C++ implementation of the DDS (Data Distribution Service) standard of the OMG (Object Management Group). eProsima Fast DDS implements the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.",
"homepage": "https://www.eprosima.com/",
"license": "Apache-2.0",
@@ -10,6 +10,7 @@
"asio",
"fastcdr",
"foonathan-memory",
"nlohmann-json",
"openssl",
"tinyxml2",
{

View File

@@ -2750,7 +2750,7 @@
},
"fastdds": {
"baseline": "3.2.2",
"port-version": 1
"port-version": 2
},
"fastfeat": {
"baseline": "391d5e9",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c6aec23afb0337f6b4c9dedfe33337637ef258bd",
"version": "3.2.2",
"port-version": 2
},
{
"git-tree": "b1431d5adb47acec8c108f251c320a96b977ec0e",
"version": "3.2.2",