From 9c00f3de02f4f540dee9a4ccaa146ddd76b79cda Mon Sep 17 00:00:00 2001 From: TSC21 Date: Wed, 2 Oct 2019 13:16:02 +0100 Subject: [PATCH] microRTPS bridge: CMake: add verbosity regarding the FastRTPSGen version --- src/modules/micrortps_bridge/CMakeLists.txt | 8 ++++++++ .../micrortps_bridge/micrortps_client/CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/modules/micrortps_bridge/CMakeLists.txt b/src/modules/micrortps_bridge/CMakeLists.txt index 09e0249a6e..a3bf5fdf13 100644 --- a/src/modules/micrortps_bridge/CMakeLists.txt +++ b/src/modules/micrortps_bridge/CMakeLists.txt @@ -38,6 +38,14 @@ find_program(FASTRTPSGEN fastrtpsgen PATHS $ENV{FASTRTPSGEN_DIR}) if(NOT FASTRTPSGEN) message(FATAL_ERROR "Unable to find fastrtpsgen") +else() + execute_process( + COMMAND $ENV{FASTRTPSGEN_DIR}fastrtpsgen -version + OUTPUT_VARIABLE FASTRTPSGEN_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + message(STATUS "${FASTRTPSGEN_VERSION}") endif() if (EXISTS "${PX4_SOURCE_DIR}/msg/tools/uorb_rtps_message_ids.yaml") diff --git a/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt b/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt index 95a5d79723..3d74fbc57a 100644 --- a/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt +++ b/src/modules/micrortps_bridge/micrortps_client/CMakeLists.txt @@ -81,7 +81,7 @@ if (NOT "${config_rtps_send_topics}" STREQUAL "" OR NOT "${config_rtps_receive_t --agent-outdir ${CMAKE_CURRENT_BINARY_DIR}/micrortps_agent --client-outdir ${CMAKE_CURRENT_BINARY_DIR}/micrortps_client --idl-dir ${CMAKE_CURRENT_BINARY_DIR}/micrortps_agent/idl - >micrortps_bridge.log > /dev/null + >micrortps_bridge.log >/dev/null DEPENDS ${send_topic_files} ${receive_topic_files} COMMENT "Generating RTPS topic bridge" )