Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/test.meta
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"names":
{
"fastrtps":
"fastdds":
{
"cmake-args": [
"-DSECURITY=ON"
Expand Down
2 changes: 1 addition & 1 deletion fastdds_python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ set(CMAKE_SWIG_FLAGS "")
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)

find_package(fastcdr REQUIRED)
find_package(fastrtps 2.12 REQUIRED)
find_package(fastdds 3 REQUIRED)

###############################################################################
# Project subdirectories
Expand Down
2 changes: 1 addition & 1 deletion fastdds_python/colcon.pkg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "fastdds_python",
"type": "cmake",
"build-dependencies": ["fastrtps"]
"build-dependencies": ["fastdds"]
}
2 changes: 1 addition & 1 deletion fastdds_python/src/swig/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ endif()
target_link_libraries(${PROJECT_NAME}
Python3::Module
fastcdr
fastrtps
fastdds
)

# Find the installation path
Expand Down
3 changes: 1 addition & 2 deletions fastdds_python/src/swig/fastdds.i
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
%include "typemaps.i"

%{
#include "fastrtps/config.h"
#include "fastdds/config.h"

bool has_statistics()
{
Expand Down Expand Up @@ -90,7 +90,6 @@ bool has_statistics();
// Macro delcarations
// Any macro used on the Fast DDS header files will give an error if it is not redefined here
#define RTPS_DllAPI
#define FASTRTPS_DEPRECATED(msg)
#define FASTDDS_DEPRECATED_UNTIL(major, entity_name, msg)
#define FASTDDS_TODO_BEFORE(major, minor, msg)

Expand Down
47 changes: 47 additions & 0 deletions fastdds_python/test/api/DEFAULT_FASTDDS_PROFILES.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8" ?>
<dds xmlns="http://www.eprosima.com">
<profiles>
<participant profile_name="test_participant_profile">
<domainId>3</domainId>
<rtps>
<name>test_name</name>
</rtps>
</participant>

<publisher profile_name="test_publisher_profile">
<qos>
<partition>
<names>
<name>partition_name_c</name>
</names>
</partition>
</qos>
</publisher>

<subscriber profile_name="test_subscriber_profile">
<qos>
<partition>
<names>
<name>partition_name_b</name>
</names>
</partition>
</qos>
</subscriber>

<publisher profile_name="test_datawriter_profile">
<qos>
<durability>
<kind>VOLATILE</kind>
</durability>
</qos>
</publisher>

<subscriber profile_name="test_datareader_profile">
<qos>
<reliability>
<kind>RELIABLE</kind>
</reliability>
</qos>
</subscriber>
</profiles>
</dds>
2 changes: 1 addition & 1 deletion fastdds_python/test/api/DEFAULT_FASTRTPS_PROFILES.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<dds xmlns="http://www.eprosima.com/XMLSchemas/fastRTPS_Profiles">
<dds xmlns="http://www.eprosima.com">
<profiles>
<participant profile_name="test_participant_profile">
<domainId>3</domainId>
Expand Down
18 changes: 9 additions & 9 deletions fastdds_python/test/types/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ message(STATUS "Configuring python wrapper for types in test_included_modules...
project(test_included_modules)

find_package(fastcdr REQUIRED)
find_package(fastrtps REQUIRED)
find_package(fastdds REQUIRED)

set(CMAKE_POSITION_INDEPENDENT_CODE ON)

Expand All @@ -43,7 +43,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
target_link_libraries(${PROJECT_NAME}
PUBLIC
fastcdr
fastrtps
fastdds
)

###############################################################################
Expand Down Expand Up @@ -88,7 +88,7 @@ endif()

target_link_libraries(${${PROJECT_NAME}_MODULE}
Python3::Module
fastrtps
fastdds
${PROJECT_NAME}
)

Expand Down Expand Up @@ -131,7 +131,7 @@ message(STATUS "Configuring python wrapper for types in test_modules...")
project(test_modules)

find_package(fastcdr REQUIRED)
find_package(fastrtps REQUIRED)
find_package(fastdds REQUIRED)

set(CMAKE_POSITION_INDEPENDENT_CODE ON)

Expand All @@ -151,7 +151,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
target_link_libraries(${PROJECT_NAME}
PUBLIC
fastcdr
fastrtps
fastdds
)

###############################################################################
Expand Down Expand Up @@ -196,7 +196,7 @@ endif()

target_link_libraries(${${PROJECT_NAME}_MODULE}
Python3::Module
fastrtps
fastdds
${PROJECT_NAME}
)

Expand Down Expand Up @@ -239,7 +239,7 @@ message(STATUS "Configuring python wrapper for types in test_complete...")
project(test_complete)

find_package(fastcdr REQUIRED)
find_package(fastrtps REQUIRED)
find_package(fastdds REQUIRED)

set(CMAKE_POSITION_INDEPENDENT_CODE ON)

Expand All @@ -259,7 +259,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
target_link_libraries(${PROJECT_NAME}
PUBLIC
fastcdr
fastrtps
fastdds
test_included_modules
)

Expand Down Expand Up @@ -305,7 +305,7 @@ endif()

target_link_libraries(${${PROJECT_NAME}_MODULE}
Python3::Module
fastrtps
fastdds
${PROJECT_NAME}
)

Expand Down
6 changes: 3 additions & 3 deletions fastdds_python_examples/HelloWorldExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ message(STATUS "Configuring python wrapper for types in HelloWorld...")
project(HelloWorld)

find_package(fastcdr REQUIRED)
find_package(fastrtps REQUIRED)
find_package(fastdds REQUIRED)

set(CMAKE_POSITION_INDEPENDENT_CODE ON)

Expand All @@ -43,7 +43,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC
target_link_libraries(${PROJECT_NAME}
PUBLIC
fastcdr
fastrtps
fastdds
)

###############################################################################
Expand Down Expand Up @@ -88,7 +88,7 @@ endif()

target_link_libraries(${${PROJECT_NAME}_MODULE}
Python3::Module
fastrtps
fastdds
${PROJECT_NAME}
)

Expand Down
2 changes: 1 addition & 1 deletion fastdds_python_examples/colcon.pkg
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"build-dependencies": [
"fastdds_python",
"fastcdr",
"fastrtps"
"fastdds"
]
}