From 70bce7a017805b25ac096817f6cecdf4646daa49 Mon Sep 17 00:00:00 2001 From: Juan Lopez Fernandez Date: Tue, 28 Jan 2025 12:42:15 +0100 Subject: [PATCH] Fix Windows compilation Signed-off-by: Juan Lopez Fernandez --- ddsrecorder/CMakeLists.txt | 11 +--- ddsrecorder/project_settings.cmake | 2 +- .../test/blackbox/FileCreationTest.hpp | 4 +- ddsrecorder/test/blackbox/sql/CMakeLists.txt | 1 + .../test/blackbox/sql/SqlFileCreationTest.cpp | 58 +++++++++---------- ddsrecorder_participants/CMakeLists.txt | 6 -- .../common/time_utils.hpp | 1 + .../project_settings.cmake | 3 +- ddsreplayer/package.xml | 1 + 9 files changed, 38 insertions(+), 49 deletions(-) diff --git a/ddsrecorder/CMakeLists.txt b/ddsrecorder/CMakeLists.txt index 9acf3588a..7bd76b9ac 100644 --- a/ddsrecorder/CMakeLists.txt +++ b/ddsrecorder/CMakeLists.txt @@ -18,6 +18,7 @@ cmake_minimum_required(VERSION 3.5) # Done this to set machine architecture and be able to call cmake_utils +enable_language(C) enable_language(CXX) ############################################################################### @@ -60,18 +61,8 @@ project( # - Configure log depending on LOG_INFO flag and CMake type configure_project_cpp() -file( - GLOB_RECURSE SOURCES_FILES - "${PROJECT_SOURCE_DIR}/src/cpp/tool/*.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/user_interface/*.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/main.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/command_receiver/Command*.cpp" - "${PROJECT_SOURCE_DIR}/src/cpp/*/*/*/*.cxx" - ) - compile_tool( "${PROJECT_SOURCE_DIR}/src/cpp/" # Source directory - "${SOURCES_FILES}" ) compile_test_tool("${PROJECT_SOURCE_DIR}/test/") diff --git a/ddsrecorder/project_settings.cmake b/ddsrecorder/project_settings.cmake index 108e39925..5216203c1 100644 --- a/ddsrecorder/project_settings.cmake +++ b/ddsrecorder/project_settings.cmake @@ -58,7 +58,7 @@ set(MODULE_THIRDPARTY_HEADERONLY mcap nlohmann-json optionparser - sqlite + sqlite # Not header-only though, need to link .c ) set(MODULE_THIRDPARTY_PATH diff --git a/ddsrecorder/test/blackbox/FileCreationTest.hpp b/ddsrecorder/test/blackbox/FileCreationTest.hpp index a65fd8e5c..0c96aa87d 100644 --- a/ddsrecorder/test/blackbox/FileCreationTest.hpp +++ b/ddsrecorder/test/blackbox/FileCreationTest.hpp @@ -293,14 +293,14 @@ class FileCreationTest : public testing::Test } } - std::filesystem::path get_output_file_path_( + std::string get_output_file_path_( const std::string& output_file_name) { const auto file_path = std::filesystem::current_path() / output_file_name; paths_.push_back(file_path); - return file_path; + return file_path.string(); } bool delete_file_( diff --git a/ddsrecorder/test/blackbox/sql/CMakeLists.txt b/ddsrecorder/test/blackbox/sql/CMakeLists.txt index 0c9b84b18..91e0fd657 100644 --- a/ddsrecorder/test/blackbox/sql/CMakeLists.txt +++ b/ddsrecorder/test/blackbox/sql/CMakeLists.txt @@ -22,6 +22,7 @@ file( GLOB_RECURSE TEST_SOURCES SqlFileCreationTest.cpp "${PROJECT_SOURCE_DIR}/test/resources/types/hello_world/*.c*" + "${PROJECT_SOURCE_DIR}/../thirdparty/sqlite/*.c" ) set(TEST_LIBRARY_SOURCES diff --git a/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp b/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp index 43368b789..ab8fa732c 100644 --- a/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp +++ b/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp @@ -165,7 +165,7 @@ TEST_F(SqlFileCreationTest, sql_data_format_cdr) // Read the recorded messages exec_sql_statement_( - OUTPUT_FILE_PATH.string(), + OUTPUT_FILE_PATH, "SELECT data_cdr_size, data_cdr, data_json FROM Messages ORDER BY log_time;", {}, [&](sqlite3_stmt* stmt) { read_message_count++; @@ -220,7 +220,7 @@ TEST_F(SqlFileCreationTest, sql_data_format_json) // Read the recorded messages exec_sql_statement_( - OUTPUT_FILE_PATH.string(), + OUTPUT_FILE_PATH, "SELECT data_cdr_size, data_cdr, data_json FROM Messages ORDER BY log_time;", {}, [&](sqlite3_stmt* stmt) { read_message_count++; @@ -275,7 +275,7 @@ TEST_F(SqlFileCreationTest, sql_data_format_both) // Read the recorded messages exec_sql_statement_( - OUTPUT_FILE_PATH.string(), + OUTPUT_FILE_PATH, "SELECT data_cdr_size, data_cdr, data_json FROM Messages ORDER BY log_time;", {}, [&](sqlite3_stmt* stmt) { read_message_count++; @@ -324,7 +324,7 @@ TEST_F(SqlFileCreationTest, sql_dds_topic) // Read the recorded topics auto read_topics_count = 0; - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT name, type FROM Topics;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT name, type FROM Topics;", {}, [&](sqlite3_stmt* stmt) { read_topics_count++; @@ -368,7 +368,7 @@ TEST_F(SqlFileCreationTest, sql_ros2_topic) // Read the recorded topics auto read_topics_count = 0; - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT name, type FROM Topics;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT name, type FROM Topics;", {}, [&](sqlite3_stmt* stmt) { read_topics_count++; @@ -407,7 +407,7 @@ TEST_F(SqlFileCreationTest, sql_data_num_msgs) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -442,7 +442,7 @@ TEST_F(SqlFileCreationTest, sql_data_num_msgs_downsampling) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -483,7 +483,7 @@ TEST_F(SqlFileCreationTest, transition_running) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -519,7 +519,7 @@ TEST_F(SqlFileCreationTest, transition_paused) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -616,7 +616,7 @@ TEST_F(SqlFileCreationTest, transition_running_paused) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -651,7 +651,7 @@ TEST_F(SqlFileCreationTest, transition_running_suspended) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -686,7 +686,7 @@ TEST_F(SqlFileCreationTest, transition_running_stopped) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -721,7 +721,7 @@ TEST_F(SqlFileCreationTest, transition_paused_running) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -756,7 +756,7 @@ TEST_F(SqlFileCreationTest, transition_paused_suspended) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -791,7 +791,7 @@ TEST_F(SqlFileCreationTest, transition_paused_stopped) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -826,7 +826,7 @@ TEST_F(SqlFileCreationTest, transition_suspended_running) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -861,7 +861,7 @@ TEST_F(SqlFileCreationTest, transition_suspended_paused) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -926,7 +926,7 @@ TEST_F(SqlFileCreationTest, transition_stopped_running) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -961,7 +961,7 @@ TEST_F(SqlFileCreationTest, transition_stopped_paused) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -1039,7 +1039,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_less_window) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2, WAIT, EVENT); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -1050,7 +1050,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_less_window) const auto now_tks = ddsrecorder::participants::to_ticks(now); // Find the oldest recorded message - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the oldest recorded message was recorded in the event window const auto log_time = reinterpret_cast(sqlite3_column_text(stmt, 0)); @@ -1098,7 +1098,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_max_window) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2, WAIT, EVENT); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -1109,7 +1109,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_max_window) const auto now_tks = ddsrecorder::participants::to_ticks(now); // Find the oldest recorded message - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the oldest recorded message was recorded in the event window const auto log_time = reinterpret_cast(sqlite3_column_text(stmt, 0)); @@ -1160,7 +1160,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_start) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2, WAIT, EVENT); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -1171,7 +1171,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_start) const auto now_tks = ddsrecorder::participants::to_ticks(now); // Find the oldest recorded message - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the oldest recorded message was recorded in the event window const auto log_time = reinterpret_cast(sqlite3_column_text(stmt, 0)); @@ -1218,7 +1218,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_suspend) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2, WAIT, EVENT); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -1229,7 +1229,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_suspend) const auto now_tks = ddsrecorder::participants::to_ticks(now); // Find the oldest recorded message - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the oldest recorded message was recorded in the event window const auto log_time = reinterpret_cast(sqlite3_column_text(stmt, 0)); @@ -1276,7 +1276,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_stop) record_messages_(OUTPUT_FILE_NAME, NUMBER_OF_MESSAGES_1, STATE_1, NUMBER_OF_MESSAGES_2, STATE_2, WAIT, EVENT); // Count the recorded messages - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT COUNT(*) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the recorded messages count const auto recorded_messages = sqlite3_column_int(stmt, 0); @@ -1287,7 +1287,7 @@ TEST_F(SqlFileCreationTest, transition_paused_event_stop) const auto now_tks = ddsrecorder::participants::to_ticks(now); // Find the oldest recorded message - exec_sql_statement_(OUTPUT_FILE_PATH.string(), "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) + exec_sql_statement_(OUTPUT_FILE_PATH, "SELECT MIN(log_time) FROM Messages;", {}, [&](sqlite3_stmt* stmt) { // Verify the oldest recorded message was recorded in the event window const auto log_time = reinterpret_cast(sqlite3_column_text(stmt, 0)); diff --git a/ddsrecorder_participants/CMakeLists.txt b/ddsrecorder_participants/CMakeLists.txt index 44788cbb8..53c801988 100644 --- a/ddsrecorder_participants/CMakeLists.txt +++ b/ddsrecorder_participants/CMakeLists.txt @@ -67,17 +67,11 @@ file( "${PROJECT_SOURCE_DIR}/../thirdparty/sqlite/*.c" ) -file( - GLOB_RECURSE HEADERS_FILES - "${PROJECT_SOURCE_DIR}/include/*.h*" - ) - # Compile C++ library compile_library( "${PROJECT_SOURCE_DIR}/src/cpp" # Source directory "${PROJECT_SOURCE_DIR}/include" # Include directory "${SOURCES_FILES}" - "${HEADERS_FILES}" ) ############################################################################### diff --git a/ddsrecorder_participants/include/ddsrecorder_participants/common/time_utils.hpp b/ddsrecorder_participants/include/ddsrecorder_participants/common/time_utils.hpp index 5c2fe9364..4b9242ef7 100644 --- a/ddsrecorder_participants/include/ddsrecorder_participants/common/time_utils.hpp +++ b/ddsrecorder_participants/include/ddsrecorder_participants/common/time_utils.hpp @@ -49,6 +49,7 @@ utils::Timestamp to_std_timestamp( * @param [in] time Timestamp to be converted * @param [in] format Format of the timestamp */ +DDSRECORDER_PARTICIPANTS_DllAPI utils::Timestamp to_std_timestamp( const std::string& time); diff --git a/ddsrecorder_participants/project_settings.cmake b/ddsrecorder_participants/project_settings.cmake index f95704c3e..4aa5303bd 100644 --- a/ddsrecorder_participants/project_settings.cmake +++ b/ddsrecorder_participants/project_settings.cmake @@ -40,7 +40,8 @@ endif() set(MODULE_THIRDPARTY_HEADERONLY mcap nlohmann-json - sqlite) + sqlite # Not header-only though, need to link .c + ) set(fastdds_MINIMUM_VERSION "3.0.0") diff --git a/ddsreplayer/package.xml b/ddsreplayer/package.xml index edad50440..6f3501798 100644 --- a/ddsreplayer/package.xml +++ b/ddsreplayer/package.xml @@ -19,6 +19,7 @@ cpp_utils ddspipe_core + ddsrecorder_participants ddsrecorder_yaml doxygen