Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove now obsolete connext workaround #203

Merged
merged 1 commit into from
Dec 15, 2017
Merged

remove now obsolete connext workaround #203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions rcl/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,6 @@ 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 Down Expand Up @@ -208,17 +201,6 @@ 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()

# Build simple executable for using in the test_rmw_impl_id_check
add_executable(test_rmw_impl_id_check_exe
rcl/test_rmw_impl_id_check_exe.cpp)
Expand Down