Skip to content

Commit

Permalink
Workaround for the change in libnddscore.so in connext 5.2.0 between …
Browse files Browse the repository at this point in the history
…gcc4.6.3 and gcc4.8.2 (#55)

* Workaround for the change in libnddscore.so in connext 5.2.0 between gcc4.6.3 and gcc4.8.2

* Prefix macro variables with underscore
  • Loading branch information
dhood authored and wjwwood committed Apr 28, 2016
1 parent 11753a3 commit 7aeb957
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions rcl/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,13 @@ function(test_target_function)
AMENT_DEPENDENCIES ${rmw_implementation} "example_interfaces"
)

# TODO remove this once connext declares libdl dependency in libnddscore again
# See https://github.com/ros2/rcl/issues/52
if("${rmw_implementation} " STREQUAL "rmw_connext_cpp ")
connext_workaround(client_fixture${target_suffix})
connext_workaround(service_fixture${target_suffix})
endif()

rcl_add_custom_launch_test(test_services
service_fixture
client_fixture
Expand All @@ -139,4 +146,15 @@ function(test_target_function)
)
endfunction()

macro(connext_workaround target)
if("${CMAKE_CXX_COMPILER_ID} " STREQUAL "GNU ")
get_target_property(_current_link_flags ${target} LINK_FLAGS)
set(_link_flags "-Wl,--no-as-needed")
if(_current_link_flags)
set(_link_flags ${_current_link_flags} ${_link_flags})
endif()
set_target_properties(${target} PROPERTIES LINK_FLAGS "${_link_flags}")
endif()
endmacro()

call_for_each_rmw_implementation(test_target)

0 comments on commit 7aeb957

Please sign in to comment.