Skip to content

Commit

Permalink
Address more review comments
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Rose <dan@digilabs.io>
  • Loading branch information
rotu committed Sep 25, 2019
1 parent c26cca1 commit 50a2bc3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions rmw_implementation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ else()
find_package(Poco REQUIRED COMPONENTS Foundation)

message(STATUS "Runtime selection of RMW enabled")


link_directories(${Poco_LIBRARY_DIR})
add_library(${PROJECT_NAME} SHARED
src/functions.cpp)
ament_target_dependencies(${PROJECT_NAME}
"Poco"
"rmw")

target_link_libraries(${PROJECT_NAME} Poco::Foundation)
target_compile_definitions(${PROJECT_NAME}
PUBLIC "DEFAULT_RMW_IMPLEMENTATION=${RMW_IMPLEMENTATION}")
configure_rmw_library(${PROJECT_NAME})
Expand Down
6 changes: 2 additions & 4 deletions rmw_implementation/rmw_implementation-extras.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ if(@RMW_IMPLEMENTATION_DISABLE_RUNTIME_SELECTION@)
"The RMW implementation has been specified as "
"'${requested_rmw_implementation}' via "
"${requested_rmw_implementation_from}, but rmw_implementation was built "
"only with support for '@RMW_IMPLEMENTATION@'."
)
"only with support for '@RMW_IMPLEMENTATION@'.")
endif()
find_package("@RMW_IMPLEMENTATION@" REQUIRED)

Expand All @@ -57,8 +56,7 @@ else()
"The RMW implementation has been specified as "
"'${requested_rmw_implementation}' via "
"${requested_rmw_implementation_from}, but it is not available at this "
"time.\n Make sure it does not expect a typesupport or other build "
"dependencies.\n\n Currently available middlewares: "
"time.\n\nCurrently available middlewares:\n"
"'${available_rmw_implementations}'")
endif()

Expand Down

0 comments on commit 50a2bc3

Please sign in to comment.