From d025364258c2370174de802ed0434249d4198e11 Mon Sep 17 00:00:00 2001 From: Irene Bandera Date: Wed, 10 Jan 2024 18:54:46 +0100 Subject: [PATCH] Uncrustify Signed-off-by: Irene Bandera --- controller/controller_tool/CMakeLists.txt | 2 +- .../DdsRecorderCommand/DdsRecorderCommand.cxx | 340 ++++++++++++------ .../DdsRecorderCommand/DdsRecorderCommand.h | 10 +- .../DdsRecorderCommandPubSubTypes.cxx | 2 +- .../DdsRecorderStatus/DdsRecorderStatus.cxx | 2 +- .../v1/DdsRecorderStatus/DdsRecorderStatus.h | 10 +- .../DdsRecorderStatusPubSubTypes.cxx | 2 +- .../v2/DdsRecorderCommand/CMakeLists.txt | 1 - .../DdsRecorderCommand/DdsRecorderCommand.cxx | 2 +- .../DdsRecorderCommandPubSubTypes.cxx | 2 +- .../DdsRecorderCommandv1.cxx | 2 +- .../DdsRecorderCommand/DdsRecorderCommandv1.h | 2 +- .../v2/DdsRecorderStatus/CMakeLists.txt | 1 - .../DdsRecorderStatus/DdsRecorderStatus.cxx | 2 +- .../DdsRecorderStatusPubSubTypes.cxx | 2 +- .../DdsRecorderStatus/DdsRecorderStatusv1.cxx | 2 +- .../DdsRecorderStatus/DdsRecorderStatusv1.h | 2 +- ddsrecorder/CMakeLists.txt | 53 +-- .../cpp/command_receiver/CommandReceiver.hpp | 4 +- .../DdsRecorderCommand/DdsRecorderCommand.h | 10 +- .../DdsRecorderCommandTypeObject.h | 12 +- .../v1/DdsRecorderStatus/DdsRecorderStatus.h | 10 +- .../DdsRecorderStatusTypeObject.h | 12 +- ddsrecorder/test/blackbox/mcap/CMakeLists.txt | 8 +- .../blackbox/mcap/McapFileCreationTest.cpp | 9 +- ddsrecorder_participants/CMakeLists.txt | 266 ++------------ .../recorder/mcap/McapHandler.hpp | 4 +- .../src/cpp/recorder/mcap/McapHandler.cpp | 17 +- ddsreplayer/src/cpp/tool/DdsReplayer.cpp | 16 +- ddsreplayer/src/cpp/tool/DdsReplayer.hpp | 4 +- ddsreplayer/test/blackbox/mcap/CMakeLists.txt | 16 +- .../blackbox/mcap/dds/HelloWorldSubscriber.h | 4 +- 32 files changed, 364 insertions(+), 467 deletions(-) diff --git a/controller/controller_tool/CMakeLists.txt b/controller/controller_tool/CMakeLists.txt index 9056dfb11..fcfb22e48 100644 --- a/controller/controller_tool/CMakeLists.txt +++ b/controller/controller_tool/CMakeLists.txt @@ -54,7 +54,7 @@ if (BUILD_DDSRECORDER_CONTROLLER) ############################################################################### # Determine Fast DDS version - if ("${FASTRTPS_VERSION}" LESS 2.13) + if ("${fastrtps_VERSION}" VERSION_LESS 2.13) set(FASTDDS_SUBDIRECTORY "v1") else() set(FASTDDS_SUBDIRECTORY "v2") diff --git a/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommand.cxx b/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommand.cxx index 765948b4c..5a176add0 100644 --- a/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommand.cxx +++ b/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommand.cxx @@ -1,112 +1,234 @@ +// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/*! + * @file DdsRecorderCommand.cxx + * This source file contains the definition of the described types in the IDL file. + * + * This file was generated by the tool gen. + */ + +#ifdef _WIN32 +// Remove linker warning LNK4221 on Visual Studio +namespace { +char dummy; +} // namespace +#endif // _WIN32 + +#include "DdsRecorderCommand.h" +#include -cmake_minimum_required(VERSION 3.16.3) +#include +using namespace eprosima::fastcdr::exception; -# SWIG: use standard target name. -if(POLICY CMP0078) - cmake_policy(SET CMP0078 NEW) -endif() +#include + +#define DdsRecorderCommand_max_cdr_typesize 520ULL; +#define DdsRecorderCommand_max_key_cdr_typesize 0ULL; -# SWIG: use SWIG_MODULE_NAME property. -if(POLICY CMP0086) - cmake_policy(SET CMP0086 NEW) -endif() - -############################################################################### -# Library for types defined in DdsRecorderCommand IDL -############################################################################### - -message(STATUS "Configuring python wrapper for types in DdsRecorderCommand...") - -############################################################################### -# Type library on C++ - -project(DdsRecorderCommand) - -find_package(fastcdr REQUIRED) -find_package(fastrtps REQUIRED) - - -set(${PROJECT_NAME}_FILES - DdsRecorderCommand.cxx - DdsRecorderCommandPubSubTypes.cxx - ) - -include_directories() - -set(CMAKE_POSITION_INDEPENDENT_CODE ON) - -#Create library for C++ types -add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_FILES}) -if(WIN32) - target_compile_definitions(${PROJECT_NAME} PRIVATE EPROSIMA_USER_DLL_EXPORT) -endif(WIN32) -target_link_libraries(${PROJECT_NAME} PUBLIC fastcdr fastrtps) - -############################################################################### -# Python bindings for type - -find_package(SWIG REQUIRED) -include(${SWIG_USE_FILE}) -set(CMAKE_SWIG_FLAGS "") - -find_package(Python3 COMPONENTS Interpreter Development REQUIRED) -set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS}) -set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) -set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) - -include_directories(${PYTHON_INCLUDE_PATH}) - -set(${PROJECT_NAME}_MODULE - DdsRecorderCommandWrapper - ) - -set(${PROJECT_NAME}_MODULE_FILES - ${PROJECT_NAME}.i - ) - -SET_SOURCE_FILES_PROPERTIES( - ${${PROJECT_NAME}_MODULE_FILES} - PROPERTIES CPLUSPLUS ON - USE_TARGET_INCLUDE_DIRECTORIES TRUE - ) - -include_directories( - ${PROJECT_SOURCE_DIR} - ) - -SWIG_ADD_LIBRARY(${${PROJECT_NAME}_MODULE} - TYPE SHARED - LANGUAGE python - SOURCES ${${PROJECT_NAME}_MODULE_FILES}) - -if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 8) - set_property(TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_COMPILE_DEFINITIONS SWIGWORDSIZE64) -endif() - -SWIG_LINK_LIBRARIES(${${PROJECT_NAME}_MODULE} - Python3::Module - fastrtps - ${PROJECT_NAME} - ) - -# Find the installation path -execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}'))" - OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - -get_filename_component (_ABS_PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH} ABSOLUTE) -file (RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH}) -SET (PYTHON_MODULE_PATH - ${_REL_PYTHON_MODULE_PATH} - ) - -# Install -install(TARGETS ${PROJECT_NAME} - RUNTIME DESTINATION bin/ - LIBRARY DESTINATION lib/ - ARCHIVE DESTINATION lib/ - ) -install(TARGETS ${${PROJECT_NAME}_MODULE} DESTINATION ${PYTHON_MODULE_PATH}) -get_property(support_files TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_SUPPORT_FILES) -install(FILES ${support_files} DESTINATION ${PYTHON_MODULE_PATH}) +DdsRecorderCommand::DdsRecorderCommand() +{ + // string m_command + m_command =""; + // string m_args + m_args =""; + +} + +DdsRecorderCommand::~DdsRecorderCommand() +{ + + +} + +DdsRecorderCommand::DdsRecorderCommand( + const DdsRecorderCommand& x) +{ + m_command = x.m_command; + m_args = x.m_args; +} + +DdsRecorderCommand::DdsRecorderCommand( + DdsRecorderCommand&& x) noexcept +{ + m_command = std::move(x.m_command); + m_args = std::move(x.m_args); +} + +DdsRecorderCommand& DdsRecorderCommand::operator =( + const DdsRecorderCommand& x) +{ + + m_command = x.m_command; + m_args = x.m_args; + + return *this; +} + +DdsRecorderCommand& DdsRecorderCommand::operator =( + DdsRecorderCommand&& x) noexcept +{ + + m_command = std::move(x.m_command); + m_args = std::move(x.m_args); + + return *this; +} + +bool DdsRecorderCommand::operator ==( + const DdsRecorderCommand& x) const +{ + + return (m_command == x.m_command && m_args == x.m_args); +} + +bool DdsRecorderCommand::operator !=( + const DdsRecorderCommand& x) const +{ + return !(*this == x); +} + +size_t DdsRecorderCommand::getMaxCdrSerializedSize( + size_t current_alignment) +{ + static_cast(current_alignment); + return DdsRecorderCommand_max_cdr_typesize; +} + +size_t DdsRecorderCommand::getCdrSerializedSize( + const DdsRecorderCommand& data, + size_t current_alignment) +{ + (void)data; + size_t initial_alignment = current_alignment; + + + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.command().size() + 1; + + current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.args().size() + 1; + + + return current_alignment - initial_alignment; +} + +void DdsRecorderCommand::serialize( + eprosima::fastcdr::Cdr& scdr) const +{ + + scdr << m_command.c_str(); + scdr << m_args.c_str(); + +} + +void DdsRecorderCommand::deserialize( + eprosima::fastcdr::Cdr& dcdr) +{ + + dcdr >> m_command; + dcdr >> m_args; +} + +/*! + * @brief This function copies the value in member command + * @param _command New value to be copied in member command + */ +void DdsRecorderCommand::command( + const std::string& _command) +{ + m_command = _command; +} + +/*! + * @brief This function moves the value in member command + * @param _command New value to be moved in member command + */ +void DdsRecorderCommand::command( + std::string&& _command) +{ + m_command = std::move(_command); +} + +/*! + * @brief This function returns a constant reference to member command + * @return Constant reference to member command + */ +const std::string& DdsRecorderCommand::command() const +{ + return m_command; +} + +/*! + * @brief This function returns a reference to member command + * @return Reference to member command + */ +std::string& DdsRecorderCommand::command() +{ + return m_command; +} +/*! + * @brief This function copies the value in member args + * @param _args New value to be copied in member args + */ +void DdsRecorderCommand::args( + const std::string& _args) +{ + m_args = _args; +} + +/*! + * @brief This function moves the value in member args + * @param _args New value to be moved in member args + */ +void DdsRecorderCommand::args( + std::string&& _args) +{ + m_args = std::move(_args); +} + +/*! + * @brief This function returns a constant reference to member args + * @return Constant reference to member args + */ +const std::string& DdsRecorderCommand::args() const +{ + return m_args; +} + +/*! + * @brief This function returns a reference to member args + * @return Reference to member args + */ +std::string& DdsRecorderCommand::args() +{ + return m_args; +} + + +size_t DdsRecorderCommand::getKeyMaxCdrSerializedSize( + size_t current_alignment) +{ + static_cast(current_alignment); + return DdsRecorderCommand_max_key_cdr_typesize; +} + +bool DdsRecorderCommand::isKeyDefined() +{ + return false; +} + +void DdsRecorderCommand::serializeKey( + eprosima::fastcdr::Cdr& scdr) const +{ + (void) scdr; +} diff --git a/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommand.h b/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommand.h index bcd93e4d7..51dcd1769 100644 --- a/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommand.h +++ b/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommand.h @@ -175,11 +175,11 @@ class DdsRecorderCommand eProsima_user_DllExport std::string& args(); /*! - * @brief This function returns the maximum serialized size of an object - * depending on the buffer alignment. - * @param current_alignment Buffer alignment. - * @return Maximum serialized size. - */ + * @brief This function returns the maximum serialized size of an object + * depending on the buffer alignment. + * @param current_alignment Buffer alignment. + * @return Maximum serialized size. + */ eProsima_user_DllExport static size_t getMaxCdrSerializedSize( size_t current_alignment = 0); diff --git a/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommandPubSubTypes.cxx b/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommandPubSubTypes.cxx index 2f92b59be..720747c92 100644 --- a/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommandPubSubTypes.cxx +++ b/controller/controller_tool/ddstypes/v1/DdsRecorderCommand/DdsRecorderCommandPubSubTypes.cxx @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderCommandPubSubTypes.cpp + * @file DdsRecorderCommandPubSubTypes.cxx * This header file contains the implementation of the serialization functions. * * This file was generated by the tool fastcdrgen. diff --git a/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatus.cxx b/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatus.cxx index 88ac88e47..17f5f32aa 100644 --- a/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatus.cxx +++ b/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatus.cxx @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderStatus.cpp + * @file DdsRecorderStatus.cxx * This source file contains the definition of the described types in the IDL file. * * This file was generated by the tool gen. diff --git a/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatus.h b/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatus.h index cfbc12615..ef7f75e20 100644 --- a/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatus.h +++ b/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatus.h @@ -200,11 +200,11 @@ class DdsRecorderStatus eProsima_user_DllExport std::string& info(); /*! - * @brief This function returns the maximum serialized size of an object - * depending on the buffer alignment. - * @param current_alignment Buffer alignment. - * @return Maximum serialized size. - */ + * @brief This function returns the maximum serialized size of an object + * depending on the buffer alignment. + * @param current_alignment Buffer alignment. + * @return Maximum serialized size. + */ eProsima_user_DllExport static size_t getMaxCdrSerializedSize( size_t current_alignment = 0); diff --git a/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.cxx b/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.cxx index b89abb8f5..ce6ce75ae 100644 --- a/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.cxx +++ b/controller/controller_tool/ddstypes/v1/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.cxx @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderStatusPubSubTypes.cpp + * @file DdsRecorderStatusPubSubTypes.cxx * This header file contains the implementation of the serialization functions. * * This file was generated by the tool fastcdrgen. diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/CMakeLists.txt b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/CMakeLists.txt index 95749dc5f..e210a12e9 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/CMakeLists.txt +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/CMakeLists.txt @@ -118,4 +118,3 @@ install(TARGETS ${PROJECT_NAME} install(TARGETS ${${PROJECT_NAME}_MODULE} DESTINATION ${PYTHON_MODULE_PATH}/) get_property(support_files TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_SUPPORT_FILES) install(FILES ${support_files} DESTINATION ${PYTHON_MODULE_PATH}/) - diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommand.cxx b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommand.cxx index bdcfa67fa..4b67e14f1 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommand.cxx +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommand.cxx @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderCommand.cpp + * @file DdsRecorderCommand.cxx * This source file contains the implementation of the described types in the IDL file. * * This file was generated by the tool fastddsgen. diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandPubSubTypes.cxx b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandPubSubTypes.cxx index 4348a59db..fa2c15f39 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandPubSubTypes.cxx +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandPubSubTypes.cxx @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderCommandPubSubTypes.cpp + * @file DdsRecorderCommandPubSubTypes.cxx * This header file contains the implementation of the serialization functions. * * This file was generated by the tool fastddsgen. diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandv1.cxx b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandv1.cxx index 4b3bfeebb..41e51e300 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandv1.cxx +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandv1.cxx @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderCommand.cpp + * @file DdsRecorderCommandv1.cxx * This source file contains the implementation of the described types in the IDL file. * * This file was generated by the tool fastddsgen. diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandv1.h b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandv1.h index ae03d6c94..1da59383c 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandv1.h +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderCommand/DdsRecorderCommandv1.h @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderCommand.h + * @file DdsRecorderCommandv1.h * This header file contains the declaration of the described types in the IDL file. * * This file was generated by the tool fastddsgen. diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/CMakeLists.txt b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/CMakeLists.txt index 36661fb64..13b7aa19f 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/CMakeLists.txt +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/CMakeLists.txt @@ -118,4 +118,3 @@ install(TARGETS ${PROJECT_NAME} install(TARGETS ${${PROJECT_NAME}_MODULE} DESTINATION ${PYTHON_MODULE_PATH}/) get_property(support_files TARGET ${${PROJECT_NAME}_MODULE} PROPERTY SWIG_SUPPORT_FILES) install(FILES ${support_files} DESTINATION ${PYTHON_MODULE_PATH}/) - diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatus.cxx b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatus.cxx index bd04b23f2..6e32de2b6 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatus.cxx +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatus.cxx @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderStatus.cpp + * @file DdsRecorderStatus.cxx * This source file contains the implementation of the described types in the IDL file. * * This file was generated by the tool fastddsgen. diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.cxx b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.cxx index 7efd35fc1..5d7506b0b 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.cxx +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.cxx @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderStatusPubSubTypes.cpp + * @file DdsRecorderStatusPubSubTypes.cxx * This header file contains the implementation of the serialization functions. * * This file was generated by the tool fastddsgen. diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusv1.cxx b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusv1.cxx index 6bfb99a8c..8e94280a8 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusv1.cxx +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusv1.cxx @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderStatus.cpp + * @file DdsRecorderStatusv1.cxx * This source file contains the implementation of the described types in the IDL file. * * This file was generated by the tool fastddsgen. diff --git a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusv1.h b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusv1.h index 11acbbe91..6b6d9b6c5 100644 --- a/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusv1.h +++ b/controller/controller_tool/ddstypes/v2/DdsRecorderStatus/DdsRecorderStatusv1.h @@ -13,7 +13,7 @@ // limitations under the License. /*! - * @file DdsRecorderStatus.h + * @file DdsRecorderStatusv1.h * This header file contains the declaration of the described types in the IDL file. * * This file was generated by the tool fastddsgen. diff --git a/ddsrecorder/CMakeLists.txt b/ddsrecorder/CMakeLists.txt index 46014ad24..771d3737d 100644 --- a/ddsrecorder/CMakeLists.txt +++ b/ddsrecorder/CMakeLists.txt @@ -60,45 +60,26 @@ project( # - Configure log depending on LOG_INFO flag and CMake type configure_project_cpp() -# Check FastDDS version -if(FASTRTPS_VERSION LESS 2.13) - message(STATUS "FastDDS version is less than 2.13. Compiling files not containing /v2/ regex.") - - # Add source files excluding those containing /v2/ regex - file(GLOB_RECURSE SOURCE_FILES "${PROJECT_SOURCE_DIR}/src/cpp/") - foreach(SOURCE_FILE ${SOURCE_FILES}) - if(NOT SOURCE_FILE MATCHES "/v2/") - compile_tool(${SOURCE_FILE}) - endif() - endforeach() - - # Add tests excluding those containing /v2/ regex - file(GLOB_RECURSE TEST_FILES "${PROJECT_SOURCE_DIR}/test/") - foreach(TEST_FILE ${TEST_FILES}) - if(NOT TEST_FILE MATCHES "/v2/") - compile_test_tool(${TEST_FILE}) - endif() - endforeach() - +# Determine Fast DDS version +if ("${fastrtps_VERSION}" VERSION_LESS 2.13) + set(FASTDDS_SUBDIRECTORY "/v2/") else() - # FastDDS version is 2.13 or greater, compile all source files - # Add source files excluding those containing /v1/ regex - file(GLOB_RECURSE SOURCE_FILES "${PROJECT_SOURCE_DIR}/src/cpp/") - foreach(SOURCE_FILE ${SOURCE_FILES}) - if(NOT SOURCE_FILE MATCHES "/v1/") - compile_tool(${SOURCE_FILE}) - endif() - endforeach() + set(FASTDDS_SUBDIRECTORY "/v1/") +endif() - # Add tests excluding those containing /v1/ regex - file(GLOB_RECURSE TEST_FILES "${PROJECT_SOURCE_DIR}/test/") - foreach(TEST_FILE ${TEST_FILES}) - if(NOT TEST_FILE MATCHES "/v1/") - compile_test_tool(${TEST_FILE}) - endif() - endforeach() +file(GLOB_RECURSE SOURCES_FILES "${PROJECT_SOURCE_DIR}/src/cpp/") +foreach(SOURCE_FILE ${SOURCES_FILES}) + if(NOT SOURCE_FILE MATCHES ${FASTDDS_SUBDIRECTORY}) + compile_tool(${SOURCE_FILE}) + endif() +endforeach() -endif() +file(GLOB_RECURSE TEST_FILES "${PROJECT_SOURCE_DIR}/test/") +foreach(TEST_FILE ${TEST_FILES}) + if(NOT TEST_FILE MATCHES ${FASTDDS_SUBDIRECTORY}) + compile_test_tool(${TEST_FILE}) + endif() +endforeach() ############################################################################### # Packaging diff --git a/ddsrecorder/src/cpp/command_receiver/CommandReceiver.hpp b/ddsrecorder/src/cpp/command_receiver/CommandReceiver.hpp index ad7174606..a8f37d5d0 100644 --- a/ddsrecorder/src/cpp/command_receiver/CommandReceiver.hpp +++ b/ddsrecorder/src/cpp/command_receiver/CommandReceiver.hpp @@ -35,7 +35,7 @@ #include #include -#if FASTRTPS_VERSION_MINOR <= 12 +#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include "types/v1/DdsRecorderCommand/DdsRecorderCommandPubSubTypes.h" #include "types/v1/DdsRecorderCommand/DdsRecorderCommandTypeObject.h" #include "types/v1/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.h" @@ -45,7 +45,7 @@ #include "types/v2/DdsRecorderCommand/DdsRecorderCommandTypeObject.h" #include "types/v2/DdsRecorderStatus/DdsRecorderStatusPubSubTypes.h" #include "types/v2/DdsRecorderStatus/DdsRecorderStatusTypeObject.h" -#endif // if FASTRTPS_VERSION_MINOR <= 12 +#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 namespace eprosima { namespace ddsrecorder { diff --git a/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderCommand/DdsRecorderCommand.h b/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderCommand/DdsRecorderCommand.h index bcd93e4d7..51dcd1769 100644 --- a/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderCommand/DdsRecorderCommand.h +++ b/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderCommand/DdsRecorderCommand.h @@ -175,11 +175,11 @@ class DdsRecorderCommand eProsima_user_DllExport std::string& args(); /*! - * @brief This function returns the maximum serialized size of an object - * depending on the buffer alignment. - * @param current_alignment Buffer alignment. - * @return Maximum serialized size. - */ + * @brief This function returns the maximum serialized size of an object + * depending on the buffer alignment. + * @param current_alignment Buffer alignment. + * @return Maximum serialized size. + */ eProsima_user_DllExport static size_t getMaxCdrSerializedSize( size_t current_alignment = 0); diff --git a/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderCommand/DdsRecorderCommandTypeObject.h b/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderCommand/DdsRecorderCommandTypeObject.h index 4aa55d506..7158aaa66 100644 --- a/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderCommand/DdsRecorderCommandTypeObject.h +++ b/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderCommand/DdsRecorderCommandTypeObject.h @@ -31,10 +31,10 @@ #define eProsima_user_DllExport __declspec( dllexport ) #else #define eProsima_user_DllExport -#endif +#endif // if defined(EPROSIMA_USER_DLL_EXPORT) #else #define eProsima_user_DllExport -#endif +#endif // if defined(_WIN32) #if defined(_WIN32) #if defined(EPROSIMA_USER_DLL_EXPORT) @@ -45,7 +45,7 @@ #endif // DdsRecorderCommand_SOURCE #else #define DdsRecorderCommand_DllAPI -#endif +#endif // if defined(EPROSIMA_USER_DLL_EXPORT) #else #define DdsRecorderCommand_DllAPI #endif // _WIN32 @@ -54,8 +54,10 @@ using namespace eprosima::fastrtps::types; eProsima_user_DllExport void registerDdsRecorderCommandTypes(); -eProsima_user_DllExport const TypeIdentifier* GetDdsRecorderCommandIdentifier(bool complete = false); -eProsima_user_DllExport const TypeObject* GetDdsRecorderCommandObject(bool complete = false); +eProsima_user_DllExport const TypeIdentifier* GetDdsRecorderCommandIdentifier( + bool complete = false); +eProsima_user_DllExport const TypeObject* GetDdsRecorderCommandObject( + bool complete = false); eProsima_user_DllExport const TypeObject* GetMinimalDdsRecorderCommandObject(); eProsima_user_DllExport const TypeObject* GetCompleteDdsRecorderCommandObject(); diff --git a/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderStatus/DdsRecorderStatus.h b/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderStatus/DdsRecorderStatus.h index cfbc12615..ef7f75e20 100644 --- a/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderStatus/DdsRecorderStatus.h +++ b/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderStatus/DdsRecorderStatus.h @@ -200,11 +200,11 @@ class DdsRecorderStatus eProsima_user_DllExport std::string& info(); /*! - * @brief This function returns the maximum serialized size of an object - * depending on the buffer alignment. - * @param current_alignment Buffer alignment. - * @return Maximum serialized size. - */ + * @brief This function returns the maximum serialized size of an object + * depending on the buffer alignment. + * @param current_alignment Buffer alignment. + * @return Maximum serialized size. + */ eProsima_user_DllExport static size_t getMaxCdrSerializedSize( size_t current_alignment = 0); diff --git a/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderStatus/DdsRecorderStatusTypeObject.h b/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderStatus/DdsRecorderStatusTypeObject.h index 969d8d7a8..759aad885 100644 --- a/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderStatus/DdsRecorderStatusTypeObject.h +++ b/ddsrecorder/src/cpp/command_receiver/types/v1/DdsRecorderStatus/DdsRecorderStatusTypeObject.h @@ -31,10 +31,10 @@ #define eProsima_user_DllExport __declspec( dllexport ) #else #define eProsima_user_DllExport -#endif +#endif // if defined(EPROSIMA_USER_DLL_EXPORT) #else #define eProsima_user_DllExport -#endif +#endif // if defined(_WIN32) #if defined(_WIN32) #if defined(EPROSIMA_USER_DLL_EXPORT) @@ -45,7 +45,7 @@ #endif // DdsRecorderStatus_SOURCE #else #define DdsRecorderStatus_DllAPI -#endif +#endif // if defined(EPROSIMA_USER_DLL_EXPORT) #else #define DdsRecorderStatus_DllAPI #endif // _WIN32 @@ -54,8 +54,10 @@ using namespace eprosima::fastrtps::types; eProsima_user_DllExport void registerDdsRecorderStatusTypes(); -eProsima_user_DllExport const TypeIdentifier* GetDdsRecorderStatusIdentifier(bool complete = false); -eProsima_user_DllExport const TypeObject* GetDdsRecorderStatusObject(bool complete = false); +eProsima_user_DllExport const TypeIdentifier* GetDdsRecorderStatusIdentifier( + bool complete = false); +eProsima_user_DllExport const TypeObject* GetDdsRecorderStatusObject( + bool complete = false); eProsima_user_DllExport const TypeObject* GetMinimalDdsRecorderStatusObject(); eProsima_user_DllExport const TypeObject* GetCompleteDdsRecorderStatusObject(); diff --git a/ddsrecorder/test/blackbox/mcap/CMakeLists.txt b/ddsrecorder/test/blackbox/mcap/CMakeLists.txt index b3feb7bb3..6055f4f59 100644 --- a/ddsrecorder/test/blackbox/mcap/CMakeLists.txt +++ b/ddsrecorder/test/blackbox/mcap/CMakeLists.txt @@ -19,7 +19,7 @@ set(TEST_NAME McapFileCreationTest) # Determine Fast DDS version -if ("${FASTRTPS_VERSION}" LESS 2.13) +if ("${fastrtps_VERSION}" VERSION_LESS 2.13) set(FASTDDS_SUBDIRECTORY "v1") else() set(FASTDDS_SUBDIRECTORY "v2") @@ -28,13 +28,9 @@ endif() set(TEST_SOURCES McapFileCreationTest.cpp ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorld.cxx - ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldv1.cxx ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldPubSubTypes.cxx ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldTypeObject.cxx - - if ("${FASTRTPS_VERSION}" GREATER_EQUAL 2.13) - ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldv1.cxx - endif() + $<$:${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/v2/hello_world/HelloWorldv1.cxx> ) set(TEST_LIST diff --git a/ddsrecorder/test/blackbox/mcap/McapFileCreationTest.cpp b/ddsrecorder/test/blackbox/mcap/McapFileCreationTest.cpp index b0c327ce8..6f80d9119 100644 --- a/ddsrecorder/test/blackbox/mcap/McapFileCreationTest.cpp +++ b/ddsrecorder/test/blackbox/mcap/McapFileCreationTest.cpp @@ -33,8 +33,13 @@ #include -#include "types/hello_world/HelloWorldTypeObject.h" -#include "types/hello_world/HelloWorldPubSubTypes.h" +#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 + #include "types/v1/hello_world/HelloWorldTypeObject.h" + #include "types/v1/hello_world/HelloWorldPubSubTypes.h" +#else + #include "types/v2/hello_world/HelloWorldTypeObject.h" + #include "types/v2/hello_world/HelloWorldPubSubTypes.h" +#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include #include diff --git a/ddsrecorder_participants/CMakeLists.txt b/ddsrecorder_participants/CMakeLists.txt index e3ae56ecb..b10b2fc18 100644 --- a/ddsrecorder_participants/CMakeLists.txt +++ b/ddsrecorder_participants/CMakeLists.txt @@ -61,258 +61,34 @@ project( configure_project_cpp() # Determine Fast DDS version -if ("${FASTRTPS_VERSION}" LESS 2.13) - set(FASTDDS_SUBDIRECTORY "v1") +if ("${fastrtps_VERSION}" VERSION_LESS 2.13) + set(FASTDDS_SUBDIRECTORY "/v1/") else() - set(FASTDDS_SUBDIRECTORY "v2") + set(FASTDDS_SUBDIRECTORY "/v2/") endif() -if (BUILD_LIBRARY) - - ############################################################################### - # Check needed variables - ############################################################################### - if(NOT DEFINED MODULE_NAME) - message(FATAL_ERROR "MODULE_NAME is not defined. Use load_project_settings or configure_project macros to set it") - endif() - - ############################################################################### - # Get source files - ############################################################################### - # Project sources - file( - GLOB_RECURSE SOURCES_FILES - "${PROJECT_SOURCE_DIR}/src/cpp/replayer/*.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/**/mcap/*.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/**/**/${FASTDDS_SUBDIRECTORY}/*.cpp" - ) - - # Project headers - if(MSVC) - file( - GLOB_RECURSE HEADERS_FILES - ${PROJECT_SOURCE_DIR}/include/*.hpp - ${PROJECT_SOURCE_DIR}/include/replayer/*.hpp - ${PROJECT_SOURCE_DIR}/include/**/mcap/*.hpp - ${PROJECT_SOURCE_DIR}/include/**/**/${FASTDDS_SUBDIRECTORY}/*.hpp - ) - endif() - - set(${MODULE_NAME}_SOURCES - ${SOURCES_FILES} - ${HEADERS_FILES} - ) - - ############################################################################### - # Compile library - ############################################################################### - # Configure config files for dll and library - configure_file( - ${cmake_utils_LIBRARY_HEADERS_TEMPLATES_PATH}/config.h.in - ${PROJECT_BINARY_DIR}/include/${MODULE_NAME}/library/config.h) - configure_file( - ${cmake_utils_LIBRARY_HEADERS_TEMPLATES_PATH}/library_dll.h.in - ${PROJECT_BINARY_DIR}/include/${MODULE_NAME}/library/library_dll.h) - configure_file( - ${cmake_utils_LIBRARY_HEADERS_TEMPLATES_PATH}/eProsima_auto_link.h.in - ${PROJECT_BINARY_DIR}/include/${MODULE_NAME}/library/eProsima_auto_link.h) - - # Create library - add_library(${MODULE_NAME} ${${MODULE_NAME}_SOURCES}) - set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${MODULE_VERSION}) - set_target_properties(${MODULE_NAME} PROPERTIES SOVERSION ${MODULE_VERSION_MAJOR}) - # set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_TARGET_NAME}) - - # Define Public API - target_compile_definitions(${MODULE_NAME} - PRIVATE - ${MODULE_MACRO}_SOURCE - ) - - if(LOG_INFO) - target_compile_definitions(${MODULE_NAME} - PRIVATE FASTDDS_ENFORCE_LOG_INFO - PRIVATE HAVE_LOG_NO_INFO=0 - ) - endif() - - if(MSVC) - target_compile_definitions(${MODULE_NAME} - INTERFACE - _CRT_DECLARE_NONSTDC_NAMES=0 - PRIVATE - EPROSIMA_USER_DLL_EXPORT - WIN32_WINNT=0x0603 - _CRT_DECLARE_NONSTDC_NAMES=0 - ) - endif(MSVC) - - - target_include_directories( - ${MODULE_NAME} - PUBLIC - $ - $ - $ - $ - $ - $ - ${MODULE_PUBLIC_EXTRA_HEADERS} - PRIVATE - ${MODULE_PRIVATE_EXTRA_HEADERS} - ) - - target_link_libraries(${MODULE_NAME} - ${MODULE_DEPENDENCIES} - ) - - if(MSVC OR MSVC_IDE) - set_target_properties(${MODULE_NAME} PROPERTIES RELEASE_POSTFIX -${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}) - set_target_properties(${MODULE_NAME} PROPERTIES MINSIZEREL_POSTFIX m-${MODULE_VERSION}) - set_target_properties(${MODULE_NAME} PROPERTIES RELWITHDEBINFO_POSTFIX rd-${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}) - set_target_properties(${MODULE_NAME} PROPERTIES DEBUG_POSTFIX d-${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}) - - get_target_property(TARGET_TYPE ${MODULE_NAME} TYPE) - if(TARGET_TYPE STREQUAL "SHARED_LIBRARY") - - # Export symbols in DLL library - string(REPLACE "-" "_" PREPROCESS_DYN_LINK "${MODULE_MACRO}_DYN_LINK") - target_compile_definitions(${MODULE_NAME} PUBLIC ${PREPROCESS_DYN_LINK}) - - # Define how to export symbol's info - set_target_properties(${MODULE_NAME} PROPERTIES - PDB_NAME_DEBUG "${MODULE_NAME}d-${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}" - PDB_NAME_RELWITHDEBINFO "${MODULE_NAME}-${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}" - PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/symbols" - ) - else() - # Rename the library to have a "lib" before. - set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME lib${MODULE_NAME}) - set_target_properties(${MODULE_NAME} PROPERTIES - COMPILE_PDB_NAME_DEBUG "lib${MODULE_NAME}d-${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}" - COMPILE_PDB_NAME_RELWITHDEBINFO "lib${MODULE_NAME}-${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}" - COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/symbols" - ) - endif() - - if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set_target_properties(${MODULE_NAME} PROPERTIES VS_WINRT_COMPONENT "true") - endif() - endif() - - ############################################################################### - # Packaging - ############################################################################### - # Install headers - install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/${MODULE_HEADERS_PATH} - DESTINATION ${INCLUDE_INSTALL_DIR} - COMPONENT headers - FILES_MATCHING - PATTERN "*.h" - PATTERN "*.hpp" - PATTERN "*.ipp" - ) - - # Install config headers - install( - FILES - ${PROJECT_BINARY_DIR}/include/${MODULE_NAME}/library/config.h - ${PROJECT_BINARY_DIR}/include/${MODULE_NAME}/library/eProsima_auto_link.h - ${PROJECT_BINARY_DIR}/include/${MODULE_NAME}/library/library_dll.h - DESTINATION - ${INCLUDE_INSTALL_DIR}/${MODULE_HEADERS_INSTALL_PATH}/library - COMPONENT headers - ) - - set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C++ Headers") - set(CPACK_COMPONENT_HEADERS_DESCRIPTION "eProsima ${MODULE_NAME_LARGE} C++ Headers") - - install(TARGETS ${MODULE_NAME} - EXPORT ${MODULE_NAME}-targets - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - COMPONENT libraries - ) - - install(EXPORT ${MODULE_NAME}-targets - DESTINATION ${LIB_INSTALL_DIR}/cmake/${MODULE_NAME} - COMPONENT cmake - ) - - if(MSVC OR MSVC_IDE) - - foreach(CONFIG ${CMAKE_CONFIGURATION_TYPES}) - - # first try dll symbols - set(PDB_PROPERTY PDB_NAME_${CONFIG}) - string(TOUPPER ${PDB_PROPERTY} PDB_PROPERTY) - get_target_property(PDB_FILE ${MODULE_NAME} ${PDB_PROPERTY}) - - if(PDB_FILE) - get_target_property(PDB_DIR ${MODULE_NAME} PDB_OUTPUT_DIRECTORY) - set(PDB_FILE "${PDB_DIR}/${CONFIG}/${PDB_FILE}.pdb") - else() - # fallback to static lib symbols - set(PDB_PROPERTY COMPILE_PDB_NAME_${CONFIG}) - string(TOUPPER ${PDB_PROPERTY} PDB_PROPERTY) - get_target_property(PDB_FILE ${MODULE_NAME} COMPILE_PDB_NAME_${CONFIG}) - - if(PDB_FILE) - get_target_property(PDB_DIR ${MODULE_NAME} COMPILE_PDB_OUTPUT_DIRECTORY) - set(PDB_FILE "${PDB_DIR}/${PDB_FILE}.pdb") - endif() - endif() - - if(PDB_FILE) - # Install symbols - install(FILES ${PDB_FILE} - DESTINATION ${LIB_INSTALL_DIR} - COMPONENT symbols - OPTIONAL - ) - endif() - - endforeach() - - endif() - - ############################################################################### - # Create CMake package config file - ############################################################################### - include(CMakePackageConfigHelpers) - - configure_package_config_file( - ${cmake_utils_CONFIG_TEMPLATES_PATH}/library-Config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}-config.cmake - INSTALL_DESTINATION - ${MODULE_LIB_INSTALL_DIR}/cmake/${MODULE_NAME} - PATH_VARS - BIN_INSTALL_DIR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR DATA_INSTALL_DIR +file( + GLOB_RECURSE SOURCES_FILES + "${PROJECT_SOURCE_DIR}/src/cpp/replayer/*.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/recorder/**/*.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/**/**${FASTDDS_SUBDIRECTORY}*.cpp" ) - write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}-config-version.cmake - VERSION - ${MODULE_VERSION} - COMPATIBILITY - SameMajorVersion +file( + GLOB_RECURSE HEADERS_FILES + ${PROJECT_SOURCE_DIR}/include/constants.hpp + ${PROJECT_SOURCE_DIR}/include/replayer/*.hpp + ${PROJECT_SOURCE_DIR}/include/recorder/**/*.hpp + ${PROJECT_SOURCE_DIR}/include/**/**${FASTDDS_SUBDIRECTORY}*.hpp ) - install( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}-config-version.cmake - DESTINATION - ${MODULE_LIB_INSTALL_DIR}/cmake/${MODULE_NAME} - COMPONENT - cmake - ) - - set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries") - set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION "eProsima ${MODULE_NAME_LARGE} libraries") - -endif() +# Compile C++ library +compile_library( + "${PROJECT_SOURCE_DIR}/src/cpp" # Source directory + "${PROJECT_SOURCE_DIR}/include" # Include directory + "${SOURCES_FILES}" + "${HEADERS_FILES}" +) ############################################################################### # Test diff --git a/ddsrecorder_participants/include/ddsrecorder_participants/recorder/mcap/McapHandler.hpp b/ddsrecorder_participants/include/ddsrecorder_participants/recorder/mcap/McapHandler.hpp index 1f0695419..374f66e95 100644 --- a/ddsrecorder_participants/include/ddsrecorder_participants/recorder/mcap/McapHandler.hpp +++ b/ddsrecorder_participants/include/ddsrecorder_participants/recorder/mcap/McapHandler.hpp @@ -39,11 +39,11 @@ #include #include -#if FASTRTPS_VERSION_MINOR < 13 +#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include #else #include -#endif // if FASTRTPS_VERSION_MINOR < 13 +#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 namespace eprosima { namespace ddsrecorder { diff --git a/ddsrecorder_participants/src/cpp/recorder/mcap/McapHandler.cpp b/ddsrecorder_participants/src/cpp/recorder/mcap/McapHandler.cpp index 7010c5143..effb88d44 100644 --- a/ddsrecorder_participants/src/cpp/recorder/mcap/McapHandler.cpp +++ b/ddsrecorder_participants/src/cpp/recorder/mcap/McapHandler.cpp @@ -37,7 +37,7 @@ #include -#if FASTRTPS_VERSION_MINOR < 13 +#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include #include #include @@ -47,7 +47,7 @@ #include #include #include -#endif // if FASTRTPS_VERSION_MINOR < 13 +#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include @@ -1127,8 +1127,13 @@ std::string McapHandler::serialize_type_identifier_( eprosima::fastcdr::FastBuffer fastbuffer((char*) payload.data, payload.max_size); // Create CDR serializer - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr::DDS_CDR); + #else + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::CdrVersion::XCDRv1); + #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 + payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Serialize @@ -1180,8 +1185,12 @@ std::string McapHandler::serialize_type_object_( eprosima::fastcdr::FastBuffer fastbuffer((char*) payload.data, payload.max_size); // Create CDR serializer - eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, + #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr::DDS_CDR); + #else + eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::CdrVersion::XCDRv1); + #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 payload.encapsulation = ser.endianness() == eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Serialize diff --git a/ddsreplayer/src/cpp/tool/DdsReplayer.cpp b/ddsreplayer/src/cpp/tool/DdsReplayer.cpp index 434c0b626..cae2975b5 100644 --- a/ddsreplayer/src/cpp/tool/DdsReplayer.cpp +++ b/ddsreplayer/src/cpp/tool/DdsReplayer.cpp @@ -33,13 +33,13 @@ #include -#if FASTRTPS_VERSION_MINOR < 13 +#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include #include #else #include #include -#endif // if FASTRTPS_VERSION_MINOR < 13 +#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include @@ -501,7 +501,11 @@ fastrtps::types::TypeIdentifier DdsReplayer::deserialize_type_identifier_( fastrtps::rtps::CDRMessage::readData(cdr_message, payload.data, parameter_length); // Create CDR deserializer - fastcdr::Cdr deser(fastbuffer, fastcdr::Cdr::DEFAULT_ENDIAN, fastcdr::CdrVersion::XCDRv1); + #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 + fastcdr::Cdr deser(fastbuffer, fastcdr::Cdr::DEFAULT_ENDIAN, fastcdr::Cdr::DDS_CDR); + #else + fastcdr::Cdr deser(fastbuffer, fastcdr::Cdr::DEFAULT_ENDIAN, fastcdr::CdrVersion::XCDRv1); + #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 payload.encapsulation = deser.endianness() == fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize @@ -539,7 +543,11 @@ fastrtps::types::TypeObject DdsReplayer::deserialize_type_object_( fastrtps::rtps::CDRMessage::readData(cdr_message, payload.data, parameter_length); // Create CDR deserializer - fastcdr::Cdr deser(fastbuffer, fastcdr::Cdr::DEFAULT_ENDIAN, fastcdr::CdrVersion::XCDRv1); + #if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 + fastcdr::Cdr deser(fastbuffer, fastcdr::Cdr::DEFAULT_ENDIAN, fastcdr::Cdr::DDS_CDR); + #else + fastcdr::Cdr deser(fastbuffer, fastcdr::Cdr::DEFAULT_ENDIAN, fastcdr::CdrVersion::XCDRv1); + #endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 payload.encapsulation = deser.endianness() == fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE; // Deserialize diff --git a/ddsreplayer/src/cpp/tool/DdsReplayer.hpp b/ddsreplayer/src/cpp/tool/DdsReplayer.hpp index 433e8fddd..efc06a6d0 100644 --- a/ddsreplayer/src/cpp/tool/DdsReplayer.hpp +++ b/ddsreplayer/src/cpp/tool/DdsReplayer.hpp @@ -33,11 +33,11 @@ #include #include -#if FASTRTPS_VERSION_MINOR < 13 +#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include #else #include -#endif // if FASTRTPS_VERSION_MINOR < 13 +#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include diff --git a/ddsreplayer/test/blackbox/mcap/CMakeLists.txt b/ddsreplayer/test/blackbox/mcap/CMakeLists.txt index ddd247cae..3a82f2eed 100644 --- a/ddsreplayer/test/blackbox/mcap/CMakeLists.txt +++ b/ddsreplayer/test/blackbox/mcap/CMakeLists.txt @@ -19,21 +19,19 @@ set(TEST_NAME McapFileReadTest) # Determine Fast DDS version -if ("${FASTRTPS_VERSION}" LESS 2.13) +if ("${fastrtps_VERSION}" VERSION_LESS 2.13) set(FASTDDS_SUBDIRECTORY "v1") else() set(FASTDDS_SUBDIRECTORY "v2") endif() set(TEST_SOURCES - McapFileReadTest.cpp - ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorld.cxx - # if ("${FASTRTPS_VERSION}" GREATER_EQUAL 2.13) - # ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldv1.cxx - # endif() - ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldPubSubTypes.cxx - ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/HelloWorldSubscriber.cpp - ) + McapFileReadTest.cpp + ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorld.cxx + $<$:${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/v2/hello_world/HelloWorldv1.cxx> + ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldPubSubTypes.cxx + ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/HelloWorldSubscriber.cpp +) set(TEST_LIST trivial diff --git a/ddsreplayer/test/blackbox/mcap/dds/HelloWorldSubscriber.h b/ddsreplayer/test/blackbox/mcap/dds/HelloWorldSubscriber.h index 6cde0cfb5..ecf4dc2f7 100644 --- a/ddsreplayer/test/blackbox/mcap/dds/HelloWorldSubscriber.h +++ b/ddsreplayer/test/blackbox/mcap/dds/HelloWorldSubscriber.h @@ -24,11 +24,11 @@ #include #include -#if FASTRTPS_VERSION_MINOR < 13 +#if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 #include "types/v1/hello_world/HelloWorldPubSubTypes.h" #else #include "types/v2/hello_world/HelloWorldPubSubTypes.h" -#endif // if FASTRTPS_VERSION_MINOR < 13 +#endif // if FASTRTPS_VERSION_MAJOR <= 2 && FASTRTPS_VERSION_MINOR < 13 struct DataToCheck {